support multiple log message handlers in base/logging.h

chrome/browser/media/webrtc/webrtc_browsertest_base.cc

 // Copyright 2013 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 "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
 
 #include <stddef.h>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 50 matching lines @@
 namespace {
 
 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,
+                                        const std::string& file,
                                         int line,
-                                        size_t message_start,
                                         const std::string& str) {
-  if (file == NULL || std::string("CONSOLE") != file)
+  if (std::string("CONSOLE") != file)
     return false;
 
   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;
 }
@@ skipping 32 matching lines @@
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionRequestObserver);
 };
 
 }  // 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);
+  logging::AddLogMessageHandler(&JavascriptErrorDetectingLogHandler);
   hit_javascript_errors_.Get() = false;
 
   EnablePixelOutput();
 }
 
 WebRtcTestBase::~WebRtcTestBase() {
   if (detect_errors_in_javascript_) {
     EXPECT_FALSE(hit_javascript_errors_.Get())
         << "Encountered javascript errors during test execution (Search "
         << "for Uncaught or ERROR:CONSOLE in the test output).";
   }
+  logging::RemoveLogMessageHandler(&JavascriptErrorDetectingLogHandler);
 }
 
 bool WebRtcTestBase::GetUserMediaAndAccept(
     content::WebContents* tab_contents) const {
   return GetUserMediaWithSpecificConstraintsAndAccept(
       tab_contents, kAudioVideoCallConstraints);
 }
 
 bool WebRtcTestBase::GetUserMediaWithSpecificConstraintsAndAccept(
     content::WebContents* tab_contents,
@@ skipping 319 matching lines @@
 void WebRtcTestBase::SetDefaultVideoCodec(
     content::WebContents* tab,
     const std::string& video_codec) const {
   EXPECT_EQ("ok-forced",
             ExecuteJavascript("forceVideoCodec('" + video_codec + "')", tab));
 }
 
 void WebRtcTestBase::EnableOpusDtx(content::WebContents* tab) const {
   EXPECT_EQ("ok-forced", ExecuteJavascript("forceOpusDtx()", tab));
 }