Clear pending events upon main frame navigation

chrome/browser/apps/web_view_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/prerender/prerender_link_manager.h"
@@ skipping 749 matching lines @@
   GetEmbedderWebContents()->GetController().Reload(false);
   ASSERT_TRUE(launched_again_listener.WaitUntilSatisfied());
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewTest, AcceptTouchEvents) {
   LoadAppWithGuest("web_view/accept_touch_events");
 
   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
 // happen when a <webview> is removed from DOM and added back.
 IN_PROC_BROWSER_TEST_F(WebViewTest,
                        AddRemoveWebView_AddRemoveWebView) {
   ASSERT_TRUE(StartEmbeddedTestServer());  // For serving guest pages.
   ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/addremove"))
       << message_;
 }
@@ skipping 1501 matching lines @@
 // http://crbug.com/403325
 #define MAYBE_WebViewInBackgroundPage \
     DISABLED_WebViewInBackgroundPage
 #else
 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage
 #endif
 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) {
   ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background"))
       << message_;
 }