Disabling DRT related initializations in unit-test mode, they...

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 95 matching lines @@
     }
     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(); }
+  TestWebKitClient* webkit_client() const { return webkit_client_.get(); }
 
 #if defined(OS_WIN)
   void set_theme_engine(WebKit::WebThemeEngine* engine) {
     DCHECK(webkit_client_ != 0);
     webkit_client_->SetThemeEngine(engine);
   }
 
-  WebKit::WebThemeEngine* theme_engine() {
+  WebKit::WebThemeEngine* theme_engine() const {
     return webkit_client_->themeEngine();
   }
 #endif
 
  private:
   scoped_ptr<base::AtExitManager> at_exit_manager_;
   scoped_ptr<MessageLoopForUI> main_message_loop_;
   scoped_ptr<TestWebKitClient> webkit_client_;
 };
 
@@ skipping 39 matching lines @@
   // 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);
 
-  webkit_support::BeforeInitialize();
+  webkit_support::BeforeInitialize(unit_test_mode);
   webkit_support::test_environment = new TestEnvironment(unit_test_mode);
-  webkit_support::AfterInitialize();
+  webkit_support::AfterInitialize(unit_test_mode);
   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();
   }
 }
 
 void SetUpTestEnvironment(bool unit_test_mode) {
   SetUpTestEnvironment();
 }
@@ skipping 295 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