Adding support for overriding TestWebKitPlatformSupport in DumpRenderTree

webkit/support/webkit_support.h

 // 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.
 
 #ifndef WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
 #define WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_
 
 #include <string>
 
 #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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 namespace WebKit {
 class WebApplicationCacheHost;
@@ skipping 12 matching lines @@
 class WebURLResponse;
 class WebView;
 struct WebPluginParams;
 struct WebURLError;
 }
 
 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
 // following functions uses WebKit API classes as possible and hide
 // implementation classes.
 namespace webkit_support {
 
 // Initializes or terminates a test environment.
 // |unit_test_mode| should be set to true when running in a TestSuite, in which
 // case no AtExitManager is created and ICU is not initialized (as it is already
 // done by the TestSuite).
 // SetUpTestEnvironment() and SetUpTestEnvironmentForUnitTests() calls
 // WebKit::initialize().
 // TearDownTestEnvironment() calls WebKit::shutdown().
 // SetUpTestEnvironmentForUnitTests() should be used when running in a
 // 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
 // DumpRenderTree.  Needs to call SetUpTestEnvironment() before this.
 // This returns a pointer to a static instance.  Don't delete it.
 WebKit::WebKitPlatformSupport* GetWebKitPlatformSupport();
 
 // This is used by WebFrameClient::createPlugin().
 WebKit::WebPlugin* CreateWebPlugin(WebKit::WebFrame* frame,
                                    const WebKit::WebPluginParams& params);
@@ skipping 184 matching lines @@
 
 void EnableWebCoreLogChannels(const std::string& channels);
 
 // - Gamepad
 
 void SetGamepadData(const WebKit::WebGamepads& pads);
 
 }  // namespace webkit_support
 
 #endif  // WEBKIT_SUPPORT_WEBKIT_SUPPORT_H_