Allow multiple logging::LogMessage{Handler,Listener}s

chrome/test/base/web_ui_browser_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/web_ui_browser_test.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 using content::WebContents;
 using content::WebUIController;
 using content::WebUIMessageHandler;
 
 namespace {
 
 base::LazyInstance<std::vector<std::string> > error_messages_ =
     LAZY_INSTANCE_INITIALIZER;
 
 // Intercepts all log messages.
-bool LogHandler(int severity,
-                const char* file,
-                int line,
-                size_t message_start,
-                const std::string& str) {
+void LogListener(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) {
   if (severity == logging::LOG_ERROR && file &&
       std::string("CONSOLE") == file) {
     error_messages_.Get().push_back(str);
   }
-
-  return false;
 }
 
 class WebUIJsInjectionReadyObserver : public content::WebContentsObserver {
  public:
   WebUIJsInjectionReadyObserver(content::WebContents* web_contents,
                                 WebUIBrowserTest* browser_test,
                                 const std::string& preload_test_fixture,
                                 const std::string& preload_test_name)
       : content::WebContentsObserver(web_contents),
         browser_test_(browser_test),
@@ skipping 215 matching lines @@
 #else
   NOTREACHED();
 #endif
 }
 
 const char WebUIBrowserTest::kDummyURL[] = "chrome://DummyURL";
 
 WebUIBrowserTest::WebUIBrowserTest()
     : test_handler_(new WebUITestHandler()),
       libraries_preloaded_(false),
-      override_selected_web_ui_(NULL) {
+      override_selected_web_ui_(NULL),
+      listener(LogListener) {
 }
 
 void WebUIBrowserTest::set_preload_test_fixture(
     const std::string& preload_test_fixture) {
   preload_test_fixture_ = preload_test_fixture;
 }
 
 void WebUIBrowserTest::set_preload_test_name(
     const std::string& preload_test_name) {
   preload_test_name_ = preload_test_name;
@@ skipping 52 matching lines @@
 };
 
 base::LazyInstance<MockWebUIProvider> mock_provider_ =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 void WebUIBrowserTest::SetUpOnMainThread() {
   JavaScriptBrowserTest::SetUpOnMainThread();
 
-  logging::SetLogMessageHandler(&LogHandler);
-
   AddLibrary(base::FilePath(kA11yAuditLibraryJSPath));
 
   content::WebUIControllerFactory::UnregisterFactoryForTesting(
       ChromeWebUIControllerFactory::GetInstance());
 
   test_factory_.reset(new TestChromeWebUIControllerFactory);
 
   content::WebUIControllerFactory::RegisterFactory(test_factory_.get());
 
   test_factory_->AddFactoryOverride(GURL(kDummyURL).host(),
                                     mock_provider_.Pointer());
   test_factory_->AddFactoryOverride(content::kChromeUIResourcesHost,
                                     mock_provider_.Pointer());
 }
 
 void WebUIBrowserTest::TearDownOnMainThread() {
-  logging::SetLogMessageHandler(NULL);
-
   test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host());
   content::WebUIControllerFactory::UnregisterFactoryForTesting(
       test_factory_.get());
 
   // This is needed to avoid a debug assert after the test completes, see stack
   // trace in http://crrev.com/179347
   content::WebUIControllerFactory::RegisterFactory(
       ChromeWebUIControllerFactory::GetInstance());
 
   test_factory_.reset();
@@ skipping 78 matching lines @@
 }
 
 GURL WebUIBrowserTest::WebUITestDataPathToURL(
     const base::FilePath::StringType& path) {
   base::FilePath dir_test_data;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &dir_test_data));
   base::FilePath test_path(dir_test_data.Append(kWebUITestFolder).Append(path));
   EXPECT_TRUE(base::PathExists(test_path));
   return net::FilePathToFileURL(test_path);
 }