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

chrome/browser/safe_browsing/safe_browsing_database_unittest.cc

 // Copyright (c) 2012 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.
 //
 // Unit tests for the SafeBrowsing storage system.
 
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 
 #include <stddef.h>
 
@@ skipping 195 matching lines @@
   EXPECT_EQ(sizeof(SBFullHash), full_hash_str.size());
   SBFullHash full_hash;
   std::memcpy(&(full_hash.full_hash), full_hash_str.data(), sizeof(SBFullHash));
   return BuildChunk(chunk_number, ChunkData::ADD, ChunkData::FULL_32B,
                     &full_hash, sizeof(full_hash), std::vector<int>());
 }
 
 // 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) {
       size_t newline = str.find('\n');
       if (newline != std::string::npos) {
         const std::string msg = str.substr(0, newline + 1);
         fprintf(stderr, "%s", msg.c_str());
         fflush(stderr);
       }
       return true;
@@ skipping 2128 matching lines @@
   ASSERT_EQ(1U, prefix_hits.size());
   EXPECT_EQ(SBPrefixForString(kExampleCollision), prefix_hits[0]);
   EXPECT_TRUE(cache_hits.empty());
 
   // This prefix collides, but no full hash match.
   EXPECT_FALSE(database_->ContainsBrowseUrl(
       GURL(std::string("http://") + kExampleFine), &prefix_hits, &cache_hits));
 }
 
 }  // namespace safe_browsing