bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 208345 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1314 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2013-07-18 23:25:28 +00:00
parent fdbb62a272
commit 0117a04bdb
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libcef/browser/browser_host_impl.h
View File

@ -331,6 +331,7 @@ class CefBrowserHostImpl : public CefBrowserHost,
const content::MediaResponseCallback& callback) OVERRIDE; const content::MediaResponseCallback& callback) OVERRIDE;
// content::WebContentsObserver methods. // content::WebContentsObserver methods.
using content::WebContentsObserver::BeforeUnloadFired;
virtual void RenderViewCreated( virtual void RenderViewCreated(
content::RenderViewHost* render_view_host) OVERRIDE; content::RenderViewHost* render_view_host) OVERRIDE;
virtual void RenderViewDeleted( virtual void RenderViewDeleted(

20
tests/unittests/test_suite.cc
View File

@ -83,16 +83,20 @@ void CefTestSuite::Initialize() {
// The below code is copied from base/test/test_suite.cc to avoid calling // The below code is copied from base/test/test_suite.cc to avoid calling
// RegisterMockCrApp() on Mac. // RegisterMockCrApp() on Mac.
// Initialize logging.
base::FilePath exe; base::FilePath exe;
PathService::Get(base::FILE_EXE, &exe); PathService::Get(base::FILE_EXE, &exe);
base::FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
logging::InitLogging( // Initialize logging.
log_filename.value().c_str(), logging::LoggingSettings log_settings;
logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, log_settings.log_file =
logging::LOCK_LOG_FILE, exe.ReplaceExtension(FILE_PATH_LITERAL("log")).value().c_str();
logging::DELETE_OLD_LOG_FILE, log_settings.logging_dest = logging::LOG_TO_ALL;
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); log_settings.lock_log = logging::LOCK_LOG_FILE;
log_settings.delete_old = logging::DELETE_OLD_LOG_FILE;
log_settings.dcheck_state =
logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
logging::InitLogging(log_settings);
// We want process and thread IDs because we may have multiple processes. // We want process and thread IDs because we may have multiple processes.
// Note: temporarily enabled timestamps in an effort to catch bug 6361. // Note: temporarily enabled timestamps in an effort to catch bug 6361.
logging::SetLogItems(true, true, true, true); logging::SetLogItems(true, true, true, true);