Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « third_party/WebKit/Source/web/tests/SpinLockTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698