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

chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "url/gurl.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 
 namespace {
 
 static bool had_console_errors = false;
 
-bool HandleMessage(int severity,
+void MessageListener(int severity,
                    const char* file,
                    int line,
                    size_t message_start,
                    const std::string& str) {
   if (severity == logging::LOG_ERROR && file && file == std::string("CONSOLE"))
     had_console_errors = true;
-  return false;
 }
 
 }  // namespace
 
 class NewTabUIBrowserTest : public InProcessBrowserTest {
  public:
-  NewTabUIBrowserTest() {
-    logging::SetLogMessageHandler(&HandleMessage);
-  }
-
-  ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(NULL); }
+  NewTabUIBrowserTest(): log_listener_(MessageListener) {}
 
   void TearDown() override {
     InProcessBrowserTest::TearDown();
     ASSERT_FALSE(had_console_errors);
   }
+ private:
+  logging::ScopedLogMessageListener log_listener_;
 };
 
 // Navigate to incognito NTP. Fails if there are console errors.
 IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ShowIncognito) {
   ui_test_utils::NavigateToURL(CreateIncognitoBrowser(),
                                GURL(chrome::kChromeUINewTabURL));
 }
 
 class NewTabUIProcessPerTabTest : public NewTabUIBrowserTest {
  public:
@@ skipping 22 matching lines @@
 
   // We don't use ui_test_utils::NavigateToURLWithDisposition because that waits
   // for current loading to stop.
   content::TestNavigationObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
   browser()->OpenURL(OpenURLParams(
       GURL("data:text/html,hello world"), Referrer(), CURRENT_TAB,
       ui::PAGE_TRANSITION_TYPED, false));
   observer.Wait();
 }