Remove unnecessary references to RenderViewHost from input tests

Input largely operates in terms of RenderWidgetHosts which is what these
tests actually use. We remove some uses of RenderViewHost for clarity.

Bug: None
Change-Id: Ifd235d21379f0f69190125a93f1b23a2c2129fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485640Reviewed-by: David Bokan <bokan@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Auto-Submit: Kevin McNee <mcnee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819020}

content/browser/renderer_host/input/input_event_browsertest.cc

@@ -220,8 +220,7 @@ class InputEventBrowserTest : public ContentBrowserTest {
 IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, MAYBE_MouseDownEventTimeStamp) {
   LoadURL(kEventListenerDataURL);
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
   base::TimeTicks event_time = base::TimeTicks::Now();
   int64_t event_time_ms = event_time.since_origin().InMilliseconds();
   SimulateSyntheticMousePressAt(event_time);
@@ -238,8 +237,7 @@ IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, MAYBE_MouseDownEventTimeStamp) {
 IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, KeyDownEventTimeStamp) {
   LoadURL(kEventListenerDataURL);
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
 
   base::TimeTicks event_time = base::TimeTicks::Now();
   int64_t event_time_ms = event_time.since_origin().InMilliseconds();
@@ -258,8 +256,7 @@ IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, KeyDownEventTimeStamp) {
 IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, TouchStartEventTimeStamp) {
   LoadURL(kEventListenerDataURL);
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
 
   base::TimeTicks event_time = base::TimeTicks::Now();
   int64_t event_time_ms = event_time.since_origin().InMilliseconds();
@@ -278,8 +275,7 @@ IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, TouchStartEventTimeStamp) {
 IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, ClickEventTimeStamp) {
   LoadURL(kEventListenerDataURL);
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
 
   base::TimeTicks event_time = base::TimeTicks::Now();
   int64_t event_time_ms = event_time.since_origin().InMilliseconds();
@@ -298,8 +294,7 @@ IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, ClickEventTimeStamp) {
 IN_PROC_BROWSER_TEST_F(InputEventBrowserTest, WheelEventTimeStamp) {
   LoadURL(kEventListenerDataURL);
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
 
   base::TimeTicks event_time = base::TimeTicks::Now();
   int64_t event_time_ms = event_time.since_origin().InMilliseconds();

content/browser/renderer_host/input/mouse_latency_browsertest.cc

@@ -358,8 +358,7 @@ IN_PROC_BROWSER_TEST_F(MouseLatencyBrowserTest,
                        gfx::Vector2dF(250, 250));
   // The following wait is the upper bound for gpu swap completed callback. It
   // is two frames to account for double buffering.
-  MainThreadFrameObserver observer(RenderWidgetHostImpl::From(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget()));
+  MainThreadFrameObserver observer(GetWidgetHost());
   observer.Wait();
   observer.Wait();
 

content/browser/renderer_host/input/scroll_behavior_browsertest.cc

@@ -204,8 +204,7 @@ class ScrollBehaviorBrowserTest : public ContentBrowserTest,
     // When the first smooth scroll starts and scroll to 5 pixels, we will
     // send the second scroll to interrupt the current smooth scroll.
     constexpr int kExpectedScrollTop = 5;
-    MainThreadFrameObserver frame_observer(
-        shell()->web_contents()->GetRenderViewHost()->GetWidget());
+    MainThreadFrameObserver frame_observer(GetWidgetHost());
     while (ExecuteScriptAndExtractDouble(script) < kExpectedScrollTop)
       frame_observer.Wait();
   }
@@ -214,8 +213,7 @@ class ScrollBehaviorBrowserTest : public ContentBrowserTest,
                          double starting_scroll_top) {
     // For the scroll interruption, we want to make sure that the first smooth
     // scroll animation stops right away, and the second scroll starts.
-    MainThreadFrameObserver frame_observer(
-        shell()->web_contents()->GetRenderViewHost()->GetWidget());
+    MainThreadFrameObserver frame_observer(GetWidgetHost());
     double current = ExecuteScriptAndExtractDouble(script);
 
     // If the animation doesn't reverse within this number of pixels we fail the
@@ -231,8 +229,7 @@ class ScrollBehaviorBrowserTest : public ContentBrowserTest,
   void ValueHoldsAt(const std::string& scroll_top_script, double scroll_top) {
     // This function checks that the scroll top value holds at the given value
     // for 10 frames.
-    MainThreadFrameObserver frame_observer(
-        shell()->web_contents()->GetRenderViewHost()->GetWidget());
+    MainThreadFrameObserver frame_observer(GetWidgetHost());
     int frame_count = 5;
     while (frame_count > 0) {
       ASSERT_EQ(ExecuteScriptAndExtractDouble(scroll_top_script), scroll_top);
@@ -241,12 +238,6 @@ class ScrollBehaviorBrowserTest : public ContentBrowserTest,
     }
   }
 
-  RenderViewHost* GetRenderViewHost() const {
-    RenderViewHost* const rvh = shell()->web_contents()->GetRenderViewHost();
-    CHECK(rvh);
-    return rvh;
-  }
-
   std::unique_ptr<base::RunLoop> run_loop_;
   bool disable_threaded_scrolling_ = false;
 

content/browser/renderer_host/input/wheel_scroll_latching_browsertest.cc

@@ -156,8 +156,7 @@ IN_PROC_BROWSER_TEST_F(WheelScrollLatchingBrowserTest, MAYBE_WheelEventTarget) {
   EXPECT_EQ(0, ExecuteScriptAndExtractInt("documentWheelEventCounter"));
   EXPECT_EQ(0, ExecuteScriptAndExtractInt("scrollableDivWheelEventCounter"));
 
-  MainThreadFrameObserver frame_observer(
-      shell()->web_contents()->GetRenderViewHost()->GetWidget());
+  MainThreadFrameObserver frame_observer(GetWidgetHost());
 
   auto input_msg_watcher = std::make_unique<InputMsgWatcher>(
       GetWidgetHost(), blink::WebInputEvent::Type::kMouseWheel);

content/browser/text_fragment_browsertest.cc

@@ -624,8 +624,7 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, ScrollRestorationDisabled) {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
   run_loop.Run();
-  RunUntilInputProcessed(RenderWidgetHostImpl::From(
-      main_contents->GetRenderViewHost()->GetWidget()));
+  RunUntilInputProcessed(GetWidgetHost());
   const cc::RenderFrameMetadata& last_metadata =
       RenderFrameSubmissionObserver(main_contents).LastRenderFrameMetadata();
   EXPECT_TRUE(last_metadata.is_scroll_offset_at_top);
@@ -645,8 +644,7 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, FragmentAnchorDisabled) {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
   run_loop.Run();
-  RunUntilInputProcessed(RenderWidgetHostImpl::From(
-      main_contents->GetRenderViewHost()->GetWidget()));
+  RunUntilInputProcessed(GetWidgetHost());
   const cc::RenderFrameMetadata& last_metadata =
       RenderFrameSubmissionObserver(main_contents).LastRenderFrameMetadata();
   EXPECT_TRUE(last_metadata.is_scroll_offset_at_top);
@@ -689,8 +687,7 @@ IN_PROC_BROWSER_TEST_F(ForceLoadAtTopBrowserTest, TextFragmentAnchorDisabled) {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
   run_loop.Run();
-  RunUntilInputProcessed(RenderWidgetHostImpl::From(
-      main_contents->GetRenderViewHost()->GetWidget()));
+  RunUntilInputProcessed(GetWidgetHost());
   const cc::RenderFrameMetadata& last_metadata =
       RenderFrameSubmissionObserver(main_contents).LastRenderFrameMetadata();
   EXPECT_TRUE(last_metadata.is_scroll_offset_at_top);