webkit_support: Move the logger initialization code so that it is...

webkit/support/webkit_support.cc

 // Copyright (c) 2010 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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
@@ skipping 33 matching lines @@
 using WebKit::WebCString;
 using WebKit::WebFrame;
 using WebKit::WebMediaPlayerClient;
 using WebKit::WebPlugin;
 using WebKit::WebPluginParams;
 using WebKit::WebString;
 using WebKit::WebURL;
 
 namespace {
 
+// All fatal log messages (e.g. DCHECK failures) imply unit test failures
+void UnitTestAssertHandler(const std::string& str) {
+  FAIL() << str;
+}
+
+void InitLogging(bool enable_gp_fault_error_box) {
+  logging::SetLogAssertHandler(UnitTestAssertHandler);
+
+#if defined(OS_WIN)
+  if (!::IsDebuggerPresent()) {
+    UINT new_flags = SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX;
+    if (!enable_gp_fault_error_box)
+      new_flags |= SEM_NOGPFAULTERRORBOX;
+
+    // Preserve existing error mode, as discussed at
+    // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
+    UINT existing_flags = SetErrorMode(new_flags);
+    SetErrorMode(existing_flags | new_flags);
+  }
+#endif
+
+  FilePath log_filename;
+  PathService::Get(base::DIR_EXE, &log_filename);
+  log_filename = log_filename.AppendASCII("DumpRenderTree.log");
+  logging::InitLogging(
+      log_filename.value().c_str(),
+      // Only log to a file. This prevents debugging output from disrupting
+      // whether or not we pass.
+      logging::LOG_ONLY_TO_FILE,
+      // We might have multiple DumpRenderTree processes going at once.
+      logging::LOCK_LOG_FILE,
+      logging::DELETE_OLD_LOG_FILE);
+
+  // We want process and thread IDs because we may have multiple processes.
+  const bool kProcessId = true;
+  const bool kThreadId = true;
+  const bool kTimestamp = true;
+  const bool kTickcount = true;
+  logging::SetLogItems(kProcessId, kThreadId, !kTimestamp, kTickcount);
+}
+
 class TestEnvironment {
  public:
   explicit TestEnvironment(bool unit_test_mode) {
-    if (!unit_test_mode)
+    if (!unit_test_mode) {
       at_exit_manager_.reset(new base::AtExitManager);
+      InitLogging(false);
+    }
     main_message_loop_.reset(new MessageLoopForUI);
     // TestWebKitClient must be instantiated after the MessageLoopForUI.
     webkit_client_.reset(new TestWebKitClient(unit_test_mode));
   }
 
   ~TestEnvironment() {
     SimpleResourceLoaderBridge::Shutdown();
   }
 
   TestWebKitClient* webkit_client() { return webkit_client_.get(); }
@@ skipping 36 matching lines @@
   FilePath basePath;
   PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
   if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) {
     return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else {
     // WebKit/WebKit/chromium/ -> WebKit/
     return basePath.Append(FILE_PATH_LITERAL("../.."));
   }
 }
 
-// All fatal log messages (e.g. DCHECK failures) imply unit test failures
-void UnitTestAssertHandler(const std::string& str) {
-  FAIL() << str;
-}
-
-void InitLogging(bool enable_gp_fault_error_box) {
-  logging::SetLogAssertHandler(UnitTestAssertHandler);
-
-#if defined(OS_WIN)
-  if (!::IsDebuggerPresent()) {
-    UINT new_flags = SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX;
-    if (!enable_gp_fault_error_box)
-      new_flags |= SEM_NOGPFAULTERRORBOX;
-
-    // Preserve existing error mode, as discussed at
-    // http://blogs.msdn.com/oldnewthing/archive/2004/07/27/198410.aspx
-    UINT existing_flags = SetErrorMode(new_flags);
-    SetErrorMode(existing_flags | new_flags);
-  }
-#endif
-
-  FilePath log_filename;
-  PathService::Get(base::DIR_EXE, &log_filename);
-  log_filename = log_filename.AppendASCII("DumpRenderTree.log");
-  logging::InitLogging(
-      log_filename.value().c_str(),
-      // Only log to a file. This prevents debugging output from disrupting
-      // whether or not we pass.
-      logging::LOG_ONLY_TO_FILE,
-      // We might have multiple DumpRenderTree processes going at once.
-      logging::LOCK_LOG_FILE,
-      logging::DELETE_OLD_LOG_FILE);
-
-  // We want process and thread IDs because we may have multiple processes.
-  const bool kProcessId = true;
-  const bool kThreadId = true;
-  const bool kTimestamp = true;
-  const bool kTickcount = true;
-  logging::SetLogItems(kProcessId, kThreadId, !kTimestamp, kTickcount);
-}
-
 }  // namespace
 
 namespace webkit_support {
 
 static TestEnvironment* test_environment;
 
 static void SetUpTestEnvironmentImpl(bool unit_test_mode) {
   base::EnableInProcessStackDumping();
   base::EnableTerminationOnHeapCorruption();
 
   // Initialize the singleton CommandLine with fixed values.  Some code refer to
   // CommandLine::ForCurrentProcess().  We don't use the actual command-line
   // arguments of DRT to avoid unexpected behavior change.
   //
   // webkit/glue/webmediaplayer_impl.cc checks --enable-openmax.
   // webkit/glue/plugin/plugin_list_posix.cc checks --debug-plugin-loading.
   // webkit/glue/plugin/plugin_list_win.cc checks --old-wmp.
   // If DRT needs these flags, specify them in the following kFixedArguments.
   const char* kFixedArguments[] = {"DumpRenderTree"};
   CommandLine::Init(arraysize(kFixedArguments), kFixedArguments);
 
-  InitLogging(false);
-
   webkit_support::BeforeInitialize();
   webkit_support::test_environment = new TestEnvironment(unit_test_mode);
   webkit_support::AfterInitialize();
   if (!unit_test_mode) {
     // Load ICU data tables.  This has to run after TestEnvironment is created
     // because on Linux, we need base::AtExitManager.
     icu_util::Initialize();
   }
 }
 
@@ skipping 255 matching lines @@
   if (!webkit_glue::GetExeDirectory(&dirExe)) {
       DCHECK(false);
       return WebURL();
   }
   FilePath devToolsPath = dirExe.AppendASCII(
       "resources/inspector/devtools.html");
   return net::FilePathToFileURL(devToolsPath);
 }
 
 }  // namespace webkit_support