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

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

Index: chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index 0e019c935b099b00359b0daccabdb2f02aa572db..6d9bdd2f1774e880a2229ab522fc781e64f7cf7d 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -27,30 +27,32 @@ namespace {
 
 static bool had_console_errors = false;
 
-bool HandleMessage(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;
-}
+class MessageListener : logging::LogMessageListener {
+ public:
+  void OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override {
+    if (severity == logging::LOG_ERROR && file &&
+        file == std::string("CONSOLE"))
+      had_console_errors = true;
+  }
+};
 
 }  // namespace
 
 class NewTabUIBrowserTest : public InProcessBrowserTest {
  public:
-  NewTabUIBrowserTest() {
-    logging::SetLogMessageHandler(&HandleMessage);
-  }
-
-  ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(NULL); }
+  NewTabUIBrowserTest() {}
 
   void TearDown() override {
     InProcessBrowserTest::TearDown();
     ASSERT_FALSE(had_console_errors);
   }
+
+ private:
+  MessageListener log_listener_;
 };
 
 // Navigate to incognito NTP. Fails if there are console errors.