Make sure fast-path scrolls bubble on non-scrollable guest.

chrome/browser/apps/guest_view/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 <queue>
 
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 2499 matching lines @@
              "web_view/shim", NEEDS_TEST_SERVER);
 }
 
 // Tests that a WebView accessible resource can actually be loaded from a
 // webpage in a WebView.
 IN_PROC_BROWSER_TEST_F(WebViewTest, LoadWebviewAccessibleResource) {
   TestHelper("testLoadWebviewAccessibleResource",
              "web_view/load_webview_accessible_resource", NEEDS_TEST_SERVER);
 }
 
-class WebViewTouchTest : public WebViewTest {
+class WebViewGuestScrollTest : public WebViewTest,
+                               public ::testing::WithParamInterface<bool> {
+ protected:
+  WebViewGuestScrollTest() {}
+  ~WebViewGuestScrollTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(WebViewGuestScrollTest);
+};
+
+class WebViewGuestScrollTouchTest : public WebViewGuestScrollTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kTouchEvents,
                                     switches::kTouchEventsEnabled);
 
     WebViewTest::SetUpCommandLine(command_line);
   }
 };
 
 namespace {
 
 class ScrollWaiter {
  public:
   explicit ScrollWaiter(content::RenderWidgetHostView* host_view)
       : host_view_(host_view) {}
   ~ScrollWaiter() {}
 
   void WaitForScrollChange(gfx::Vector2dF target_offset) {
     while (target_offset != host_view_->GetLastScrollOffset())
       base::MessageLoop::current()->RunUntilIdle();
   }
 
  private:
   content::RenderWidgetHostView* host_view_;
 };
 
 }  // namespace
 
 // Tests that scrolls bubble from guest to embedder.
-IN_PROC_BROWSER_TEST_F(WebViewTest, TestGuestWheelScrollsBubble) {
+// Create two test instances, one where theguest body is scrollable and the

[ncarter (slow), 2015/09/30 21:37:19]

"theguest"

+// other where the body is not scrollable: fast-path scrolling will generate
+// different ack results in between these two cases.
+INSTANTIATE_TEST_CASE_P(WebViewScrollBubbling,
+                        WebViewGuestScrollTest,
+                        ::testing::Bool());
+
+IN_PROC_BROWSER_TEST_P(WebViewGuestScrollTest, TestGuestWheelScrollsBubble) {
   LoadAppWithGuest("web_view/scrollable_embedder_and_guest");
 
+  if (GetParam())
+    SendMessageToGuestAndWait("set_overflow_hidden", "overflow_is_hidden");
+
   content::WebContents* embedder_contents = GetEmbedderWebContents();
 
   std::vector<content::WebContents*> guest_web_contents_list;
   GetGuestViewManager()->WaitForNumGuestsCreated(1u);
   GetGuestViewManager()->GetGuestWebContentsList(&guest_web_contents_list);
   ASSERT_EQ(1u, guest_web_contents_list.size());
 
   content::WebContents* guest_contents = guest_web_contents_list[0];
 
   gfx::Rect embedder_rect = embedder_contents->GetContainerBounds();
@@ skipping 51 matching lines @@
     content::SimulateMouseEvent(embedder_contents,
                                 blink::WebInputEvent::MouseMove,
                                 guest_scroll_location);
     content::SimulateMouseWheelEvent(embedder_contents, guest_scroll_location,
                                      gfx::Vector2d(0, scroll_magnitude));
 
     waiter.WaitForScrollChange(gfx::Vector2dF());
   }
 }
 
-IN_PROC_BROWSER_TEST_F(WebViewTouchTest, TestGuestGestureScrollsBubble) {
+INSTANTIATE_TEST_CASE_P(WebViewScrollBubbling,
+                        WebViewGuestScrollTouchTest,
+                        ::testing::Bool());
+
+IN_PROC_BROWSER_TEST_P(WebViewGuestScrollTouchTest,
+                       TestGuestGestureScrollsBubble) {
   // Just in case we're running ChromeOS tests, we need to make sure the
   // debounce interval is set to zero so our back-to-back gesture-scrolls don't
   // get munged together. Since the first scroll will be put on the fast
   // (compositor) path, while the second one should always be slow-path so it
   // gets to BrowserPlugin, having them merged is definitely an error.
   ui::GestureConfiguration* gesture_config =
       ui::GestureConfiguration::GetInstance();
   gesture_config->set_scroll_debounce_interval_in_ms(0);
 
   LoadAppWithGuest("web_view/scrollable_embedder_and_guest");
 
+  if (GetParam())
+    SendMessageToGuestAndWait("set_overflow_hidden", "overflow_is_hidden");
+
   content::WebContents* embedder_contents = GetEmbedderWebContents();
 
   std::vector<content::WebContents*> guest_web_contents_list;
   GetGuestViewManager()->WaitForNumGuestsCreated(1u);
   GetGuestViewManager()->GetGuestWebContentsList(&guest_web_contents_list);
   ASSERT_EQ(1u, guest_web_contents_list.size());
 
   content::WebContents* guest_contents = guest_web_contents_list[0];
 
   gfx::Rect embedder_rect = embedder_contents->GetContainerBounds();
@@ skipping 272 matching lines @@
   const task_management::Task* task = task_manager.tasks().back();
   EXPECT_EQ(task_management::Task::GUEST, task->GetType());
   const base::string16 title = task->title();
   const base::string16 expected_prefix = GetExpectedPrefix(guest_contents);
   EXPECT_TRUE(base::StartsWith(title,
                                expected_prefix,
                                base::CompareCase::INSENSITIVE_ASCII));
 }
 
 #endif  // defined(ENABLE_TASK_MANAGER)