| Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| index a43202e5cb4bf03f1c4368f662ae606d4f9e8acf..575676031f3e38dae4b38e7c5a93e4d394b832db 100644
|
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
|
| @@ -3306,7 +3306,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
|
|
| // Reload the page and end up at the same url. State should be propagated.
|
| Platform::current()->currentThread()->taskRunner()->postTask(
|
| - FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + firstURL), false));
|
| + BLINK_FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + firstURL), false));
|
| FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webViewImpl()->mainFrame());
|
| EXPECT_EQ(previousOffset.width, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
|
| EXPECT_EQ(previousOffset.height, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
|
| @@ -3314,7 +3314,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
|
|
| // Reload the page using the cache. State should not be propagated.
|
| Platform::current()->currentThread()->taskRunner()->postTask(
|
| - FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + secondURL), false));
|
| + BLINK_FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + secondURL), false));
|
| FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webViewImpl()->mainFrame());
|
| EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
|
| EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
|
| @@ -3322,7 +3322,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
|
|
| // Reload the page while ignoring the cache. State should not be propagated.
|
| Platform::current()->currentThread()->taskRunner()->postTask(
|
| - FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + thirdURL), true));
|
| + BLINK_FROM_HERE, new ReloadWithOverrideURLTask(webViewHelper.webViewImpl()->mainFrame(), toKURL(m_baseURL + thirdURL), true));
|
| FrameTestHelpers::pumpPendingRequestsDoNotUse(webViewHelper.webViewImpl()->mainFrame());
|
| EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
|
| EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
|
|
|