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

Unified Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 660663002: Clear pending events upon main frame navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updates Created 6 years, 1 month 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: chrome/browser/apps/web_view_browsertest.cc
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index 4f61be54fe0a15ace1c49fda9611fd67e14b7ade..febaaf91ff157983514fc87560cdcbd8958666db 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -767,26 +767,26 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, AcceptTouchEvents) {
content::RenderViewHost* embedder_rvh =
GetEmbedderWebContents()->GetRenderViewHost();
- bool embedder_has_touch_handler =
- content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
- EXPECT_FALSE(embedder_has_touch_handler);
+ bool embedder_will_forward_touch_events =
+ content::RenderViewHostTester::WillForwardTouchEvents(embedder_rvh);
+ EXPECT_FALSE(embedder_will_forward_touch_events);
SendMessageToGuestAndWait("install-touch-handler", "installed-touch-handler");
// Note that we need to wait for the installed/registered touch handler to
// appear in browser process before querying |embedder_rvh|.
- // In practice, since we do a roundrtip from browser process to guest and
+ // In practice, since we do a roundtrip from browser process to guest and
// back, this is sufficient.
- embedder_has_touch_handler =
- content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
- EXPECT_TRUE(embedder_has_touch_handler);
+ embedder_will_forward_touch_events =
+ content::RenderViewHostTester::WillForwardTouchEvents(embedder_rvh);
+ EXPECT_TRUE(embedder_will_forward_touch_events);
SendMessageToGuestAndWait("uninstall-touch-handler",
"uninstalled-touch-handler");
// Same as the note above about waiting.
- embedder_has_touch_handler =
- content::RenderViewHostTester::HasTouchEventHandler(embedder_rvh);
- EXPECT_FALSE(embedder_has_touch_handler);
+ embedder_will_forward_touch_events =
+ content::RenderViewHostTester::WillForwardTouchEvents(embedder_rvh);
+ EXPECT_FALSE(embedder_will_forward_touch_events);
}
// This test ensures JavaScript errors ("Cannot redefine property") do not

Powered by Google App Engine
This is Rietveld 408576698