From 0117a04bdb37a96e56abd0080a9b60702ee81939 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 18 Jul 2013 23:25:28 +0000 Subject: [PATCH] Update to Chromium revision 208345 git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1314 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser/browser_host_impl.h | 1 + tests/unittests/test_suite.cc | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libcef/browser/browser_host_impl.h b/libcef/browser/browser_host_impl.h index 4987be12c..2f7ada456 100644 --- a/libcef/browser/browser_host_impl.h +++ b/libcef/browser/browser_host_impl.h @@ -331,6 +331,7 @@ class CefBrowserHostImpl : public CefBrowserHost, const content::MediaResponseCallback& callback) OVERRIDE; // content::WebContentsObserver methods. + using content::WebContentsObserver::BeforeUnloadFired; virtual void RenderViewCreated( content::RenderViewHost* render_view_host) OVERRIDE; virtual void RenderViewDeleted( diff --git a/tests/unittests/test_suite.cc b/tests/unittests/test_suite.cc index 0ce3b4da1..d48fc16fd 100644 --- a/tests/unittests/test_suite.cc +++ b/tests/unittests/test_suite.cc @@ -83,16 +83,20 @@ void CefTestSuite::Initialize() { // The below code is copied from base/test/test_suite.cc to avoid calling // RegisterMockCrApp() on Mac. - // Initialize logging. base::FilePath exe; PathService::Get(base::FILE_EXE, &exe); - base::FilePath log_filename = exe.ReplaceExtension(FILE_PATH_LITERAL("log")); - logging::InitLogging( - log_filename.value().c_str(), - logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG, - logging::LOCK_LOG_FILE, - logging::DELETE_OLD_LOG_FILE, - logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS); + + // Initialize logging. + logging::LoggingSettings log_settings; + log_settings.log_file = + exe.ReplaceExtension(FILE_PATH_LITERAL("log")).value().c_str(); + log_settings.logging_dest = logging::LOG_TO_ALL; + 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. // Note: temporarily enabled timestamps in an effort to catch bug 6361. logging::SetLogItems(true, true, true, true);