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

chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

Index: chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 846f36026718769fce4d358fa32f3aaa6c505a93..3e78a80bdadd0013bfeb6d02d4c108db0500d16a 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -213,20 +213,12 @@ std::unique_ptr<SBChunkData> AddChunkHashedIpValue(int chunk_number,
 // Prevent DCHECK from killing tests.
 // TODO(shess): Pawel disputes the use of this, so the test which uses
 // it is DISABLED.  http://crbug.com/56448
-class ScopedLogMessageIgnorer {
- public:
-  ScopedLogMessageIgnorer() {
-    logging::SetLogMessageHandler(&LogMessageIgnorer);
-  }
-  ~ScopedLogMessageIgnorer() {
-    // TODO(shess): Would be better to verify whether anyone else
-    // changed it, and then restore it to the previous value.
-    logging::SetLogMessageHandler(NULL);
-  }
-
- private:
-  static bool LogMessageIgnorer(int severity, const char* file, int line,
-      size_t message_start, const std::string& str) {
+class ScopedLogMessageIgnorer : logging::LogMessageHandler {
+  bool OnMessage(int severity,
+                 const char* file,
+                 int line,
+                 size_t message_start,
+                 const std::string& str) override {
     // Intercept FATAL, strip the stack backtrace, and log it without
     // the crash part.
     if (severity == logging::LOG_FATAL) {