| Index: content/test/test_webkit_platform_support.h
|
| diff --git a/content/test/test_webkit_platform_support.h b/content/test/test_webkit_platform_support.h
|
| index 6c01f84cdcbd6f8d63955dc1a25fdda869358262..71b03004246fff6d68cda68555bea362494df9e0 100644
|
| --- a/content/test/test_webkit_platform_support.h
|
| +++ b/content/test/test_webkit_platform_support.h
|
| @@ -15,7 +15,7 @@
|
| #include "webkit/glue/webfileutilities_impl.h"
|
| #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebLayerTreeView;
|
| }
|
|
|
| @@ -23,36 +23,36 @@ namespace content {
|
|
|
| // An implementation of WebKitPlatformSupport for tests.
|
| class TestWebKitPlatformSupport
|
| - : public WebKit::WebUnitTestSupport,
|
| + : public blink::WebUnitTestSupport,
|
| public webkit_glue::WebKitPlatformSupportChildImpl {
|
| public:
|
| TestWebKitPlatformSupport();
|
| virtual ~TestWebKitPlatformSupport();
|
|
|
| - virtual WebKit::WebMimeRegistry* mimeRegistry();
|
| - virtual WebKit::WebClipboard* clipboard();
|
| - virtual WebKit::WebFileUtilities* fileUtilities();
|
| - virtual WebKit::WebIDBFactory* idbFactory();
|
| -
|
| - virtual WebKit::WebURLLoader* createURLLoader();
|
| - virtual WebKit::WebData loadResource(const char* name);
|
| - virtual WebKit::WebString queryLocalizedString(
|
| - WebKit::WebLocalizedString::Name name);
|
| - virtual WebKit::WebString queryLocalizedString(
|
| - WebKit::WebLocalizedString::Name name,
|
| - const WebKit::WebString& value);
|
| - virtual WebKit::WebString queryLocalizedString(
|
| - WebKit::WebLocalizedString::Name name,
|
| - const WebKit::WebString& value1,
|
| - const WebKit::WebString& value2);
|
| - virtual WebKit::WebString defaultLocale();
|
| + virtual blink::WebMimeRegistry* mimeRegistry();
|
| + virtual blink::WebClipboard* clipboard();
|
| + virtual blink::WebFileUtilities* fileUtilities();
|
| + virtual blink::WebIDBFactory* idbFactory();
|
| +
|
| + virtual blink::WebURLLoader* createURLLoader();
|
| + virtual blink::WebData loadResource(const char* name);
|
| + virtual blink::WebString queryLocalizedString(
|
| + blink::WebLocalizedString::Name name);
|
| + virtual blink::WebString queryLocalizedString(
|
| + blink::WebLocalizedString::Name name,
|
| + const blink::WebString& value);
|
| + virtual blink::WebString queryLocalizedString(
|
| + blink::WebLocalizedString::Name name,
|
| + const blink::WebString& value1,
|
| + const blink::WebString& value2);
|
| + virtual blink::WebString defaultLocale();
|
|
|
| #if defined(OS_WIN) || defined(OS_MACOSX)
|
| - void SetThemeEngine(WebKit::WebThemeEngine* engine);
|
| - virtual WebKit::WebThemeEngine* themeEngine();
|
| + void SetThemeEngine(blink::WebThemeEngine* engine);
|
| + virtual blink::WebThemeEngine* themeEngine();
|
| #endif
|
|
|
| - virtual WebKit::WebCompositorSupport* compositorSupport();
|
| + virtual blink::WebCompositorSupport* compositorSupport();
|
|
|
| WebURLLoaderMockFactory* url_loader_factory() {
|
| return url_loader_factory_.get();
|
| @@ -70,31 +70,31 @@ class TestWebKitPlatformSupport
|
| const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info)
|
| OVERRIDE;
|
| virtual webkit_glue::WebSocketStreamHandleBridge* CreateWebSocketStreamBridge(
|
| - WebKit::WebSocketStreamHandle* handle,
|
| + blink::WebSocketStreamHandle* handle,
|
| webkit_glue::WebSocketStreamHandleDelegate* delegate) OVERRIDE;
|
|
|
| - virtual WebKit::WebGestureCurve* createFlingAnimationCurve(
|
| + virtual blink::WebGestureCurve* createFlingAnimationCurve(
|
| int device_source,
|
| - const WebKit::WebFloatPoint& velocity,
|
| - const WebKit::WebSize& cumulative_scroll);
|
| + const blink::WebFloatPoint& velocity,
|
| + const blink::WebSize& cumulative_scroll);
|
|
|
| - virtual WebKit::WebUnitTestSupport* unitTestSupport();
|
| + virtual blink::WebUnitTestSupport* unitTestSupport();
|
|
|
| // WebUnitTestSupport implementation
|
| - virtual void registerMockedURL(const WebKit::WebURL& url,
|
| - const WebKit::WebURLResponse& response,
|
| - const WebKit::WebString& filePath);
|
| - virtual void registerMockedErrorURL(const WebKit::WebURL& url,
|
| - const WebKit::WebURLResponse& response,
|
| - const WebKit::WebURLError& error);
|
| - virtual void unregisterMockedURL(const WebKit::WebURL& url);
|
| + virtual void registerMockedURL(const blink::WebURL& url,
|
| + const blink::WebURLResponse& response,
|
| + const blink::WebString& filePath);
|
| + virtual void registerMockedErrorURL(const blink::WebURL& url,
|
| + const blink::WebURLResponse& response,
|
| + const blink::WebURLError& error);
|
| + virtual void unregisterMockedURL(const blink::WebURL& url);
|
| virtual void unregisterAllMockedURLs();
|
| virtual void serveAsynchronousMockedRequests();
|
| - virtual WebKit::WebString webKitRootDir();
|
| - virtual WebKit::WebLayerTreeView* createLayerTreeViewForTesting();
|
| - virtual WebKit::WebLayerTreeView* createLayerTreeViewForTesting(
|
| + virtual blink::WebString webKitRootDir();
|
| + virtual blink::WebLayerTreeView* createLayerTreeViewForTesting();
|
| + virtual blink::WebLayerTreeView* createLayerTreeViewForTesting(
|
| TestViewType type);
|
| - virtual WebKit::WebData readFromFile(const WebKit::WebString& path);
|
| + virtual blink::WebData readFromFile(const blink::WebString& path);
|
|
|
| private:
|
| webkit_glue::SimpleWebMimeRegistryImpl mime_registry_;
|
| @@ -105,7 +105,7 @@ class TestWebKitPlatformSupport
|
| webkit::WebCompositorSupportImpl compositor_support_;
|
|
|
| #if defined(OS_WIN) || defined(OS_MACOSX)
|
| - WebKit::WebThemeEngine* active_theme_engine_;
|
| + blink::WebThemeEngine* active_theme_engine_;
|
| #endif
|
| DISALLOW_COPY_AND_ASSIGN(TestWebKitPlatformSupport);
|
| };
|
|
|