Fix the testing::LogDisabler for the change r64883. See http://codereview.chromium.org/4262001/show

The r64883 broke most unit tests in CEEE that relied on disabling logs while testing error paths.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/4390001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64948 0039d316-1c4b-4281-b951-d872f2087c98

base/logging.cc

@@ -420,6 +420,10 @@ void SetLogMessageHandler(LogMessageHandlerFunction handler) {
   log_message_handler = handler;
 }
 
+LogMessageHandlerFunction GetLogMessageHandler() {
+  return log_message_handler;
+}
+
 // MSVC doesn't like complex extern templates and DLLs.
 #if !defined(COMPILER_MSVC)
 // Explicit instantiations for commonly used comparisons.

base/logging.h

@@ -245,6 +245,7 @@ void SetShowErrorDialogs(bool enable_dialogs);
 // (e.g. a silent one for Unit Tests)
 typedef void (*LogAssertHandlerFunction)(const std::string& str);
 void SetLogAssertHandler(LogAssertHandlerFunction handler);
+
 // Sets the Log Report Handler that will be used to notify of check failures
 // in non-debug mode. The default handler shows a dialog box and continues
 // the execution, however clients can use this function to override with their
@@ -258,6 +259,7 @@ void SetLogReportHandler(LogReportHandlerFunction handler);
 // should not be sent to other log destinations.
 typedef bool (*LogMessageHandlerFunction)(int severity, const std::string& str);
 void SetLogMessageHandler(LogMessageHandlerFunction handler);
+LogMessageHandlerFunction GetLogMessageHandler();
 
 typedef int LogSeverity;
 const LogSeverity LOG_INFO = 0;

ceee/testing/utils/test_utils.cc

@@ -58,13 +58,17 @@ HRESULT GetConnectionCount(IUnknown* container,
 }
 
 
+bool LogDisabler::DropMessageHandler(int severity, const std::string& str) {
+  return true;
+}
+
 LogDisabler::LogDisabler() {
-  initial_log_level_ = logging::GetMinLogLevel();
-  logging::SetMinLogLevel(logging::LOG_FATAL + 1);
+  old_handler_ = logging::GetLogMessageHandler();
+  logging::SetLogMessageHandler(DropMessageHandler);
 }
 
 LogDisabler::~LogDisabler() {
-  logging::SetMinLogLevel(initial_log_level_);
+  logging::SetLogMessageHandler(old_handler_);
 }
 
 PathServiceOverrider::PathServiceOverrider(int key, const FilePath& path) {

ceee/testing/utils/test_utils.h

@@ -67,7 +67,8 @@ class LogDisabler {
   ~LogDisabler();
 
  private:
-  int initial_log_level_;
+  logging::LogMessageHandlerFunction old_handler_;
+  static bool DropMessageHandler(int severity, const std::string& str);
 };
 
 // Overrides a path in the PathService singleton, replacing the