| Index: Source/web/tests/PinchViewportTest.cpp
|
| diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp
|
| index f6d3af15963ce1b40344f837460ac7a95f60d99f..5e34221f8fe38c5d14032894b48dcb345c6c90fe 100644
|
| --- a/Source/web/tests/PinchViewportTest.cpp
|
| +++ b/Source/web/tests/PinchViewportTest.cpp
|
| @@ -556,7 +556,7 @@ TEST_F(PinchViewportTest, TestRestoredFromHistoryItem)
|
|
|
| WebHistoryItem item;
|
| item.initialize();
|
| - WebURL destinationURL(blink::URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
|
| + WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
|
| item.setURLString(destinationURL.string());
|
| item.setPinchViewportScrollOffset(WebFloatPoint(100, 120));
|
| item.setPageScaleFactor(2);
|
| @@ -580,7 +580,7 @@ TEST_F(PinchViewportTest, TestRestoredFromLegacyHistoryItem)
|
|
|
| WebHistoryItem item;
|
| item.initialize();
|
| - WebURL destinationURL(blink::URLTestHelpers::toKURL(m_baseURL + "200-by-300-viewport.html"));
|
| + WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300-viewport.html"));
|
| item.setURLString(destinationURL.string());
|
| // (-1, -1) will be used if the HistoryItem is an older version prior to having
|
| // pinch viewport scroll offset.
|
| @@ -694,7 +694,7 @@ TEST_F(PinchViewportTest, TestWebViewResizeCausesViewportConstrainedLayout)
|
| EXPECT_TRUE(navbar->needsLayout());
|
| }
|
|
|
| -class MockWebFrameClient : public blink::WebFrameClient {
|
| +class MockWebFrameClient : public WebFrameClient {
|
| public:
|
| MOCK_METHOD1(showContextMenu, void(const WebContextMenuData&));
|
| };
|
|
|