| Index: content/public/test/layouttest_support.h
|
| diff --git a/content/public/test/layouttest_support.h b/content/public/test/layouttest_support.h
|
| index 7e56763fa36c85c90001854b1644e3fff9cecc7e..91a8098dd0e0f66f4c8fc6bc8e3fc59c6c7462fd 100644
|
| --- a/content/public/test/layouttest_support.h
|
| +++ b/content/public/test/layouttest_support.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #include "base/callback_forward.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebDeviceMotionData;
|
| class WebDeviceOrientationData;
|
| class WebGamepads;
|
| @@ -39,15 +39,15 @@ void EnableWebTestProxyCreation(const base::Callback<
|
|
|
| // Sets the WebGamepads that should be returned by
|
| // WebKitPlatformSupport::sampleGamepads().
|
| -void SetMockGamepads(const WebKit::WebGamepads& pads);
|
| +void SetMockGamepads(const blink::WebGamepads& pads);
|
|
|
| // Sets WebDeviceMotionData that should be used when registering
|
| // a listener through WebKitPlatformSupport::setDeviceMotionListener().
|
| -void SetMockDeviceMotionData(const WebKit::WebDeviceMotionData& data);
|
| +void SetMockDeviceMotionData(const blink::WebDeviceMotionData& data);
|
|
|
| // Sets WebDeviceOrientationData that should be used when registering
|
| // a listener through WebKitPlatformSupport::setDeviceOrientationListener().
|
| -void SetMockDeviceOrientationData(const WebKit::WebDeviceOrientationData& data);
|
| +void SetMockDeviceOrientationData(const blink::WebDeviceOrientationData& data);
|
|
|
| // Returns the length of the local session history of a render view.
|
| int GetLocalSessionHistoryLength(RenderView* render_view);
|
| @@ -62,7 +62,7 @@ void SetFocusAndActivate(RenderView* render_view, bool enable);
|
|
|
| // Changes the window rect of the given render view.
|
| void ForceResizeRenderView(RenderView* render_view,
|
| - const WebKit::WebSize& new_size);
|
| + const blink::WebSize& new_size);
|
|
|
| // Set the device scale factor and force the compositor to resize.
|
| void SetDeviceScaleFactor(RenderView* render_view, float factor);
|
| @@ -76,10 +76,10 @@ void UseSynchronousResizeMode(RenderView* render_view, bool enable);
|
|
|
| // Control auto resize mode.
|
| void EnableAutoResizeMode(RenderView* render_view,
|
| - const WebKit::WebSize& min_size,
|
| - const WebKit::WebSize& max_size);
|
| + const blink::WebSize& min_size,
|
| + const blink::WebSize& max_size);
|
| void DisableAutoResizeMode(RenderView* render_view,
|
| - const WebKit::WebSize& new_size);
|
| + const blink::WebSize& new_size);
|
|
|
| // Forces the |render_view| to use mock media streams.
|
| void UseMockMediaStreams(RenderView* render_view);
|
|
|