Address creis@'s suggestions for issue 2633723002.

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 5366 matching lines @@
   RenderWidgetHostViewBase* child_rwhv = static_cast<RenderWidgetHostViewBase*>(
       root->child_at(0)->current_frame_host()->GetView());
   SurfaceHitTestReadyNotifier notifier(
       static_cast<RenderWidgetHostViewChildFrame*>(child_rwhv));
   notifier.WaitForSurfaceReady();
 
   // 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);
+
   // 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
   // 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, child_input_router->allowed_touch_action());
+  EXPECT_EQ(TOUCH_ACTION_AUTO,
+            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());
   ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, child_center, 0, 0,
                              ui::EventTimeForNow(), 30.f, 30.f, 0.f, 0.f);
   rwhv->OnTouchEvent(&touch_event);
 
   // 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, child_input_router->allowed_touch_action());
+  EXPECT_EQ(TOUCH_ACTION_NONE,
+            child_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 3635 matching lines @@
 
   std::string result;
   EXPECT_TRUE(ExecuteScriptAndExtractString(
       root,
       "window.domAutomationController.send(frames[0].document.body.innerText);",
       &result));
   EXPECT_EQ("This page has no title.", result);
 }
 
 }  // namespace content