Adding support for overriding TestWebKitPlatformSupport in DumpRenderTree

webkit/support/webkit_support.h

Index: webkit/support/webkit_support.h
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 130642a4e54ed5ca21d81aeccc28cf71bf124037..58f34975ec9db683a57c466f32d3f7e57d8e4fef 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "base/callback.h"

[tony, 2012/07/09 18:23:29]

We don't want to include callback.h here.  This makes it very hard for the types
in callback.h to change since code in the WebKit repository will depend on it.

You can just use a plain function pointer typedef instead.

[Tommy Widenflycht, 2012/07/10 09:27:19]

Done.

 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
@@ -41,6 +42,10 @@ namespace webkit_media {
 class MediaStreamClient;
 }
 
+class TestWebKitPlatformSupport;
+typedef base::Callback<TestWebKitPlatformSupport*(bool)>
+    PlatformSupportCreatorCallback;
+
 // This package provides functions used by DumpRenderTree/chromium.
 // DumpRenderTree/chromium uses some code in webkit/ of Chromium. In
 // order to minimize the dependency from WebKit to Chromium, the
@@ -59,7 +64,10 @@ namespace webkit_support {
 // TestSuite, in which case no AtExitManager is created and ICU is not
 // initialized (as it is already done by the TestSuite).
 void SetUpTestEnvironment();
+void SetUpTestEnvironment(const PlatformSupportCreatorCallback& callback);
 void SetUpTestEnvironmentForUnitTests();
+void SetUpTestEnvironmentForUnitTests(
+    const PlatformSupportCreatorCallback& callback);
 void TearDownTestEnvironment();
 
 // Returns a pointer to a WebKitPlatformSupport implementation for