| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index 4a3f112917626400b361734eda6193e2b88165a5..04b49058737b76c05c9ff71f73baed31686de45a 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -3244,7 +3244,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadDoesntSetRedirect)
|
| FrameTestHelpers::reloadFrameIgnoringCache(webViewHelper.webView()->mainFrame());
|
| }
|
|
|
| -class ReloadWithOverrideURLTask : public WebThread::Task {
|
| +class ReloadWithOverrideURLTask : public WebTaskRunner::Task {
|
| public:
|
| ReloadWithOverrideURLTask(WebFrame* frame, const KURL& url, bool ignoreCache)
|
| : m_frame(frame), m_url(url), m_ignoreCache(ignoreCache)
|
| @@ -3294,7 +3294,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
| float previousScale = webViewHelper.webViewImpl()->pageScaleFactor();
|
|
|
| // Reload the page and end up at the same url. State should be propagated.
|
| - Platform::current()->currentThread()->postTask(
|
| + Platform::current()->currentThread()->defaultTaskRunner()->postTask(
|
| 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);
|
| @@ -3302,7 +3302,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
| EXPECT_EQ(previousScale, webViewHelper.webViewImpl()->pageScaleFactor());
|
|
|
| // Reload the page using the cache. State should not be propagated.
|
| - Platform::current()->currentThread()->postTask(
|
| + Platform::current()->currentThread()->defaultTaskRunner()->postTask(
|
| 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);
|
| @@ -3310,7 +3310,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
| EXPECT_EQ(1.0f, webViewHelper.webViewImpl()->pageScaleFactor());
|
|
|
| // Reload the page while ignoring the cache. State should not be propagated.
|
| - Platform::current()->currentThread()->postTask(
|
| + Platform::current()->currentThread()->defaultTaskRunner()->postTask(
|
| 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);
|
|
|