Call logging::InitLogging. The lack of this was causing some hangs (and poss...

chrome/common/ipc_tests.cc

 // Copyright (c) 2006-2008 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.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <stdio.h>
 #include <iostream>
 #include <string>
 
 #include "chrome/common/ipc_tests.h"
 
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/perftimer.h"
-#include "base/process_util.h"
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/perf_test_suite.h"
 #include "base/test_suite.h"
 #include "base/thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/ipc_channel.h"
 #include "chrome/common/ipc_channel_proxy.h"
 #include "chrome/common/ipc_message_utils.h"
 #include "testing/multiprocess_func_list.h"
 
 // Define to enable IPC performance testing instead of the regular unit tests
 // #define PERFORMANCE_TEST
@@ skipping 397 matching lines @@
   ChannelReflectorListener channel_reflector_listener(&chan);
   chan.set_listener(&channel_reflector_listener);
   chan.Connect();
 
   MessageLoop::current()->Run();
   return true;
 }
 
 #endif  // PERFORMANCE_TEST
 
-#if defined(OS_WIN)
-// All fatal log messages (e.g. DCHECK failures) imply unit test failures
-static void IPCTestAssertHandler(const std::string& str) {
-  FAIL() << str;
-}
-
-// Disable crash dialogs so that it doesn't gum up the buildbot
-static void SuppressErrorDialogs() {
-  UINT new_flags = SEM_FAILCRITICALERRORS |
-                   SEM_NOGPFAULTERRORBOX |
-                   SEM_NOOPENFILEERRORBOX;
-
-  // Preserve existing error mode, as discussed at http://t/dmea
-  UINT existing_flags = SetErrorMode(new_flags);
-  SetErrorMode(existing_flags | new_flags);
-}
-#endif  // defined(OS_WIN)
-
 int main(int argc, char** argv) {
-  base::ScopedNSAutoreleasePool scoped_pool;
-  base::EnableTerminationOnHeapCorruption();
-
-#if defined(OS_WIN)
-  // suppress standard crash dialogs and such unless a debugger is present.
-  if (!IsDebuggerPresent()) {
-    SuppressErrorDialogs();
-    logging::SetLogAssertHandler(IPCTestAssertHandler);
-  }
-#endif  // defined(OS_WIN)
-
+#ifdef PERFORMANCE_TEST
+  int retval = PerfTestSuite(argc, argv).Run();
+#else
   int retval = TestSuite(argc, argv).Run();
-
-#ifdef PERFORMANCE_TEST
-  if (!InitPerfLog("ipc_perf_child.log"))
-    return 1;
 #endif
   return retval;
 }