Unify TouchAction classes

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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 "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 10 matching lines @@
 #include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/pattern.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "cc/input/touch_action.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_proxy_host.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/loader/navigation_url_loader_network_service.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/input/input_router_impl.h"
 #include "content/browser/renderer_host/input/synthetic_tap_gesture.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input/synthetic_tap_gesture_params.h"
-#include "content/common/input/touch_action.h"
 #include "content/common/input_messages.h"
 #include "content/common/renderer.mojom.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_dispatcher_host.h"
@@ skipping 5725 matching lines @@
       embedded_test_server()->GetURL("b.com", "/page_with_touch_handler.html"));
   NavigateFrameToURL(root->child_at(0), frame_url);
 
   // Synchronize with the child and parent renderers to guarantee that the
   // surface information required for event hit testing is ready.
   WaitForChildFrameSurfaceReady(root->child_at(0)->current_frame_host());
 
   // There's no intrinsic reason the following values can't be equal, but they
   // aren't at present, and if they become the same this test will need to be
   // updated to accommodate.
-  EXPECT_NE(TOUCH_ACTION_AUTO, TOUCH_ACTION_NONE);
+  EXPECT_NE(cc::kTouchActionAuto, cc::kTouchActionNone);
 
-  // Verify the child's input router is initially set for TOUCH_ACTION_AUTO. The
-  // TouchStart event will trigger TOUCH_ACTION_NONE being sent back to the
+  // Verify the child's input router is initially set for kTouchActionAuto. The
+  // TouchStart event will trigger kTouchActionNone being sent back to the
   // browser.
   RenderWidgetHostImpl* child_render_widget_host =
       root->child_at(0)->current_frame_host()->GetRenderWidgetHost();
   InputRouterImpl* child_input_router =
       static_cast<InputRouterImpl*>(child_render_widget_host->input_router());
-  EXPECT_EQ(TOUCH_ACTION_AUTO,
+  EXPECT_EQ(cc::kTouchActionAuto,
             child_input_router->touch_action_filter_.allowed_touch_action());
 
   // Simulate touch event to sub-frame.
   gfx::Point child_center(150, 150);
   auto* rwhv = static_cast<RenderWidgetHostViewAura*>(
       contents->GetRenderWidgetHostView());
 
   // Wait until renderer's compositor thread is synced.
   {
     MainThreadFrameObserver observer(child_render_widget_host);
@@ skipping 15 matching lines @@
 
   // Verify touch handler in subframe was invoked.
   std::string result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root->child_at(0),
       "window.domAutomationController.send(getLastTouchEvent());", &result));
   EXPECT_EQ("touchstart", result);
 
   // Verify the presence of the touch handler in the child frame correctly
   // propagates touch-action:none information back to the child's input router.
-  EXPECT_EQ(TOUCH_ACTION_NONE,
+  EXPECT_EQ(cc::kTouchActionNone,
             child_input_router->touch_action_filter_.allowed_touch_action());
 }
 
 // This test verifies that the test in
 // SitePerProcessBrowserTest.SubframeTouchEventRouting also works properly for
 // the main frame. Prior to the CL in which this test is introduced, use of
 // MainThreadFrameObserver in SubframeTouchEventRouting was not necessary since
 // the touch events were handled on the main thread. Now they are handled on the
 // compositor thread, hence the need to synchronize.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest,
                        MainframeTouchEventRouting) {
   GURL main_url(embedded_test_server()->GetURL(
       "/page_with_touch_handler.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
 
   WebContentsImpl* contents = web_contents();
   FrameTreeNode* root = contents->GetFrameTree()->root();
 
   // Synchronize with the renderers to guarantee that the
   // surface information required for event hit testing is ready.
   auto* rwhv = static_cast<RenderWidgetHostViewAura*>(
       contents->GetRenderWidgetHostView());
 
   // There's no intrinsic reason the following values can't be equal, but they
   // aren't at present, and if they become the same this test will need to be
   // updated to accommodate.
-  EXPECT_NE(TOUCH_ACTION_AUTO, TOUCH_ACTION_NONE);
+  EXPECT_NE(cc::kTouchActionAuto, cc::kTouchActionNone);
 
   // Verify the main frame's input router is initially set for
-  // TOUCH_ACTION_AUTO. The
-  // TouchStart event will trigger TOUCH_ACTION_NONE being sent back to the
+  // kTouchActionAuto. The
+  // TouchStart event will trigger kTouchActionNone being sent back to the
   // browser.
   RenderWidgetHostImpl* render_widget_host =
       root->current_frame_host()->GetRenderWidgetHost();
   InputRouterImpl* input_router =
       static_cast<InputRouterImpl*>(render_widget_host->input_router());
-  EXPECT_EQ(TOUCH_ACTION_AUTO,
+  EXPECT_EQ(cc::kTouchActionAuto,
             input_router->touch_action_filter_.allowed_touch_action());
 
   // Simulate touch event to sub-frame.
   gfx::Point frame_center(150, 150);
 
   // Wait until renderer's compositor thread is synced.
   {
     auto observer =
         base::MakeUnique<MainThreadFrameObserver>(render_widget_host);
     observer->Wait();
@@ skipping 15 matching lines @@
 
   // Verify touch handler in subframe was invoked.
   std::string result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root, "window.domAutomationController.send(getLastTouchEvent());",
       &result));
   EXPECT_EQ("touchstart", result);
 
   // Verify the presence of the touch handler in the child frame correctly
   // propagates touch-action:none information back to the child's input router.
-  EXPECT_EQ(TOUCH_ACTION_NONE,
+  EXPECT_EQ(cc::kTouchActionNone,
             input_router->touch_action_filter_.allowed_touch_action());
 }
 
 namespace {
 
 // Declared here to be close to the SubframeGestureEventRouting test.
 void OnSyntheticGestureCompleted(scoped_refptr<MessageLoopRunner> runner,
                                  SyntheticGesture::Result result) {
   EXPECT_EQ(SyntheticGesture::GESTURE_FINISHED, result);
   runner->Quit();
@@ skipping 4240 matching lines @@
     names.insert(root->children[0]->frame_entry->frame_unique_name());
   }
 
   // More than one entry in the set means that the subframe frame navigation
   // entries didn't have a consistent unique name. This will break history
   // navigations =(
   EXPECT_THAT(names, SizeIs(1)) << "Mismatched names for subframe!";
 }
 
 }  // namespace content