support multiple log message handlers in base/logging.h

chrome/test/base/web_ui_browser_test.cc

Index: chrome/test/base/web_ui_browser_test.cc
diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc
index c50a43458e417ea7807b06f0105ac1e20acec35d..e8734458d8ae71193874e8f5a4962a3445c80e86 100644
--- a/chrome/test/base/web_ui_browser_test.cc
+++ b/chrome/test/base/web_ui_browser_test.cc
@@ -55,12 +55,10 @@ base::LazyInstance<std::vector<std::string> > error_messages_ =
 
 // Intercepts all log messages.
 bool LogHandler(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 &&
-      std::string("CONSOLE") == file) {
+  if (severity == logging::LOG_ERROR && std::string("CONSOLE") == file) {
     error_messages_.Get().push_back(str);
   }
 
@@ -383,7 +381,7 @@ base::LazyInstance<MockWebUIProvider> mock_provider_ =
 void WebUIBrowserTest::SetUpOnMainThread() {
   JavaScriptBrowserTest::SetUpOnMainThread();
 
-  logging::SetLogMessageHandler(&LogHandler);
+  logging::AddLogMessageHandler(&LogHandler);
 
   AddLibrary(base::FilePath(kA11yAuditLibraryJSPath));
 
@@ -401,7 +399,7 @@ void WebUIBrowserTest::SetUpOnMainThread() {
 }
 
 void WebUIBrowserTest::TearDownOnMainThread() {
-  logging::SetLogMessageHandler(NULL);
+  logging::RemoveLogMessageHandler(&LogHandler);
 
   test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host());
   content::WebUIControllerFactory::UnregisterFactoryForTesting(