support multiple log message handlers in base/logging.h

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"
@@ skipping 10 matching lines @@
 #include "url/gurl.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 
 namespace {
 
 static bool had_console_errors = false;
 
 bool HandleMessage(int severity,
-                   const char* file,
+                   const std::string& file,
                    int line,
-                   size_t message_start,
                    const std::string& str) {
-  if (severity == logging::LOG_ERROR && file && file == std::string("CONSOLE"))
+  if (severity == logging::LOG_ERROR && file == std::string("CONSOLE"))
     had_console_errors = true;
   return false;
 }
 
 }  // namespace
 
 class NewTabUIBrowserTest : public InProcessBrowserTest {
  public:
   NewTabUIBrowserTest() {
-    logging::SetLogMessageHandler(&HandleMessage);
+    logging::AddLogMessageHandler(&HandleMessage);
   }
 
-  ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(NULL); }
+  ~NewTabUIBrowserTest() override {
+    logging::RemoveLogMessageHandler(&HandleMessage);
+  }
 
   void TearDown() override {
     InProcessBrowserTest::TearDown();
     ASSERT_FALSE(had_console_errors);
   }
 };
 
 // Navigate to incognito NTP. Fails if there are console errors.
 IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ShowIncognito) {
   ui_test_utils::NavigateToURL(CreateIncognitoBrowser(),
@@ skipping 29 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(),
       WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
   observer.Wait();
 }