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 8ffe5a7498ecadb9be46dd12587910f683638c3f..ef39a42e2b0a15f3c48f414beb8d2115c0ba7ef8 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,27 @@ 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(): listener(MessageListener) {}
 
   void TearDown() override {
     InProcessBrowserTest::TearDown();
     ASSERT_FALSE(had_console_errors);
   }
+ private:
+  logging::ScopedLogMessageListener listener;

[Dan Beam, 2016/07/15 03:11:19]

all of these should be log_listener_ IMO or at least listener_ <-- we use
trailing _ for private members

[wychen, 2016/07/18 15:44:12]

Oops.

 };
 
 // Navigate to incognito NTP. Fails if there are console errors.