Adding support for overriding TestWebKitPlatformSupport in DumpRenderTree

webkit/support/webkit_support.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.
 
 #include "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 131 matching lines @@
 class TestEnvironment {
  public:
 #if defined(OS_ANDROID)
   // Android UI message loop goes through Java, so don't use it in tests.
   typedef MessageLoop MessageLoopType;
 #else
   typedef MessageLoopForUI MessageLoopType;
 #endif
 
   TestEnvironment(bool unit_test_mode,
-                  base::AtExitManager* existing_at_exit_manager) {
+                  base::AtExitManager* existing_at_exit_manager,
+                  PlatformSupportCreatorCallback callback) {
     if (unit_test_mode) {
       logging::SetLogAssertHandler(UnitTestAssertHandler);
     } else {
       // The existing_at_exit_manager must be not NULL.
       at_exit_manager_.reset(existing_at_exit_manager);
       InitLogging();
     }
     main_message_loop_.reset(new MessageLoopType);
+
     // TestWebKitPlatformSupport must be instantiated after MessageLoopType.
-    webkit_platform_support_.reset(
-      new TestWebKitPlatformSupport(unit_test_mode));
+    webkit_platform_support_.reset(callback(unit_test_mode));
 
 #if defined(OS_ANDROID)
     media_player_manager_.reset(
         new webkit_media::WebMediaPlayerManagerAndroid());
 #endif
   }
 
   ~TestEnvironment() {
     SimpleResourceLoaderBridge::Shutdown();
   }
@@ skipping 97 matching lines @@
  private:
   MessageLoop* message_loop_;
 };
 
 webkit_support::GraphicsContext3DImplementation
     g_graphics_context_3d_implementation =
         webkit_support::IN_PROCESS_COMMAND_BUFFER;
 
 TestEnvironment* test_environment;
 
-void SetUpTestEnvironmentImpl(bool unit_test_mode) {
+void SetUpTestEnvironmentImpl(PlatformSupportCreatorCallback callback,
+                              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/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);
 
   // Explicitly initialize the GURL library before spawning any threads.
   // Otherwise crash may happend when different threads try to create a GURL
   // at same time.
   url_util::Initialize();
   base::AtExitManager* at_exit_manager = NULL;
   // In Android DumpRenderTree, AtExitManager is created in
   // testing/android/native_test_wrapper.cc before main() is called.
 #if !defined(OS_ANDROID)
   // Some initialization code may use a AtExitManager before initializing
   // TestEnvironment, so we create a AtExitManager early and pass its ownership
   // to TestEnvironment.
   if (!unit_test_mode)
     at_exit_manager = new base::AtExitManager;
 #endif
   webkit_support::BeforeInitialize(unit_test_mode);
-  test_environment = new TestEnvironment(unit_test_mode, at_exit_manager);
+  test_environment =
+      new TestEnvironment(unit_test_mode, at_exit_manager, callback);
   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();
   }
   webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
       "DumpRenderTree/0.0.0.0"), false);
 }
 
 }  // namespace
 
 namespace webkit_support {
 
+TestWebKitPlatformSupport*
+CreateDefaultTestWebKitPlatformSupport(bool unit_test_mode) {
+  return new TestWebKitPlatformSupport(unit_test_mode);
+}
+
 void SetUpTestEnvironment() {
-  SetUpTestEnvironmentImpl(false);
+  SetUpTestEnvironment(CreateDefaultTestWebKitPlatformSupport);

[tommi (sloooow) - chröme, 2012/07/10 09:48:37]

SetUpTestEnvironment(&CreateDefaultTestWebKitPlatformSupport);

[Tommy Widenflycht, 2012/07/10 09:58:10]

Done.

 }
 
 void SetUpTestEnvironmentForUnitTests() {
-  SetUpTestEnvironmentImpl(true);
+  SetUpTestEnvironmentForUnitTests(CreateDefaultTestWebKitPlatformSupport);

[tommi (sloooow) - chröme, 2012/07/10 09:48:37]

missing &

[Tommy Widenflycht, 2012/07/10 09:58:10]

Done.

+}
+
+void SetUpTestEnvironment(PlatformSupportCreatorCallback callback) {
+  CHECK(callback);
+  SetUpTestEnvironmentImpl(callback, false);
+}
+
+void SetUpTestEnvironmentForUnitTests(PlatformSupportCreatorCallback callback) {
+  CHECK(callback);
+  SetUpTestEnvironmentImpl(callback, true);
 }
 
 void TearDownTestEnvironment() {
   // Flush any remaining messages before we kill ourselves.
   // http://code.google.com/p/chromium/issues/detail?id=9500
   MessageLoop::current()->RunAllPending();
 
   BeforeShutdown();
   if (RunningOnValgrind())
     WebKit::WebCache::clear();
@@ skipping 462 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support