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

chrome/browser/media/webrtc_browsertest_base.cc

Index: chrome/browser/media/webrtc_browsertest_base.cc
diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc
index 9a40c5b80c4497e6362c276edf227dd8e715f7b8..bbf0c75603fc31d2f674307a7ec77d15ed2a62f7 100644
--- a/chrome/browser/media/webrtc_browsertest_base.cc
+++ b/chrome/browser/media/webrtc_browsertest_base.cc
@@ -64,24 +64,20 @@ base::LazyInstance<bool> hit_javascript_errors_ =
       LAZY_INSTANCE_INITIALIZER;
 
 // Intercepts all log messages. We always attach this handler but only look at
-// the results if the test requests so. Note that this will only work if the
-// WebrtcTestBase-inheriting test cases do not run in parallel (if they did they
-// would race to look at the log, which is global to all tests).
-bool JavascriptErrorDetectingLogHandler(int severity,
-                                        const char* file,
-                                        int line,
-                                        size_t message_start,
-                                        const std::string& str) {
+// the results if the test requests so.
+void JavascriptErrorDetectingLogListener(int severity,
+                                         const char* file,
+                                         int line,
+                                         size_t message_start,
+                                         const std::string& str) {
   if (file == NULL || std::string("CONSOLE") != file)
-    return false;
+    return;
 
   bool contains_uncaught = str.find("\"Uncaught ") != std::string::npos;
   if (severity == logging::LOG_ERROR ||
       (severity == logging::LOG_INFO && contains_uncaught)) {
     hit_javascript_errors_.Get() = true;
   }
-
-  return false;
 }
 
 // PermissionRequestObserver ---------------------------------------------------
@@ -121,10 +117,9 @@ class PermissionRequestObserver : public PermissionBubbleManager::Observer {
 
 }  // namespace
 
-WebRtcTestBase::WebRtcTestBase(): detect_errors_in_javascript_(false) {
-  // The handler gets set for each test method, but that's fine since this
-  // set operation is idempotent.
-  logging::SetLogMessageHandler(&JavascriptErrorDetectingLogHandler);
+WebRtcTestBase::WebRtcTestBase()
+    : listener(JavascriptErrorDetectingLogListener),

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

awesome

+      detect_errors_in_javascript_(false) {
   hit_javascript_errors_.Get() = false;
 
   EnablePixelOutput();