Remove usages of WebContents::GetRenderViewHost().

This CL was uploaded by git cl split.

R=hanxi@chromium.org

Bug: 1142671
Change-Id: I28b7b2eb82e87e409f370d044f1aa2e4845d764d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500605
Auto-Submit: Lucas Gadani <lfg@chromium.org>
Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Xi Han <hanxi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821421}

chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -315,8 +315,10 @@ class LeftMouseClick {
     mouse_event_.SetPositionInScreen(point.x() + offset.x(),
                                      point.y() + offset.y());
     mouse_event_.click_count = 1;
-    web_contents_->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
-        mouse_event_);
+    web_contents_->GetMainFrame()
+        ->GetRenderViewHost()
+        ->GetWidget()
+        ->ForwardMouseEvent(mouse_event_);
 
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
@@ -336,8 +338,10 @@ class LeftMouseClick {
  private:
   void SendMouseUp() {
     mouse_event_.SetType(blink::WebInputEvent::Type::kMouseUp);
-    web_contents_->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
-        mouse_event_);
+    web_contents_->GetMainFrame()
+        ->GetRenderViewHost()
+        ->GetWidget()
+        ->ForwardMouseEvent(mouse_event_);
     click_completed_ = true;
     if (message_loop_runner_)
       message_loop_runner_->Quit();
@@ -805,11 +809,15 @@ class WebViewTest : public extensions::PlatformAppBrowserTest {
         blink::WebInputEvent::GetStaticTimeStampForTests());
     mouse_event.button = blink::WebMouseEvent::Button::kRight;
     mouse_event.SetPositionInWidget(1, 1);
-    web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
-        mouse_event);
+    web_contents->GetMainFrame()
+        ->GetRenderViewHost()
+        ->GetWidget()
+        ->ForwardMouseEvent(mouse_event);
     mouse_event.SetType(blink::WebInputEvent::Type::kMouseUp);
-    web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
-        mouse_event);
+    web_contents->GetMainFrame()
+        ->GetRenderViewHost()
+        ->GetWidget()
+        ->ForwardMouseEvent(mouse_event);
   }
 
   content::WebContents* GetGuestWebContents() {
@@ -3849,8 +3857,10 @@ IN_PROC_BROWSER_TEST_F(WebViewAccessibilityTest, DISABLED_TouchAccessibility) {
       blink::WebInputEvent::kIsTouchAccessibility,
       blink::WebInputEvent::GetStaticTimeStampForTests());
   accessibility_touch_event.SetPositionInWidget(95, 55);
-  web_contents->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(
-      accessibility_touch_event);
+  web_contents->GetMainFrame()
+      ->GetRenderViewHost()
+      ->GetWidget()
+      ->ForwardMouseEvent(accessibility_touch_event);
 
   // Ensure that we got just a single hover event on the guest WebContents,
   // and that it was fired on a button.
@@ -4002,7 +4012,7 @@ IN_PROC_BROWSER_TEST_P(WebViewGuestScrollTest,
                                 ui::LatencyInfo(ui::SourceEventType::WHEEL));
 
   content::InputEventAckWaiter update_waiter(
-      guest_contents->GetRenderViewHost()->GetWidget(),
+      guest_contents->GetMainFrame()->GetRenderViewHost()->GetWidget(),
       base::BindRepeating([](blink::mojom::InputEventResultSource,
                              blink::mojom::InputEventResultState state,
                              const blink::WebInputEvent& event) {

chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

@@ -441,7 +441,7 @@ class WebViewInteractiveTest : public extensions::PlatformAppBrowserTest {
     gfx::Rect popup_bounds = popup_rwh->GetView()->GetViewBounds();
 
     content::RenderViewHost* embedder_rvh =
-        GetFirstAppWindowWebContents()->GetRenderViewHost();
+        GetFirstAppWindowWebContents()->GetMainFrame()->GetRenderViewHost();
     gfx::Rect embedder_bounds =
         embedder_rvh->GetWidget()->GetView()->GetViewBounds();
     gfx::Vector2d diff = popup_bounds.origin() - embedder_bounds.origin();
@@ -771,7 +771,10 @@ IN_PROC_BROWSER_TEST_F(WebViewFocusInteractiveTest,
                   "window.runCommand('testFocusTracksEmbedderRunNextStep');"));
 
   // Blur the embedder.
-  embedder_web_contents->GetRenderViewHost()->GetWidget()->Blur();
+  embedder_web_contents->GetMainFrame()
+      ->GetRenderViewHost()
+      ->GetWidget()
+      ->Blur();
   // Ensure that the guest is also blurred.
   ASSERT_TRUE(next_step_listener.WaitUntilSatisfied());
 }
@@ -794,8 +797,9 @@ IN_PROC_BROWSER_TEST_F(WebViewFocusInteractiveTest, Focus_AdvanceFocus) {
     content::WebContents* guest =
         GetGuestViewManager()->WaitForSingleGuestCreated();
 
-    SimulateRWHMouseClick(guest->GetRenderViewHost()->GetWidget(),
-                          blink::WebMouseEvent::Button::kLeft, 200, 20);
+    SimulateRWHMouseClick(
+        guest->GetMainFrame()->GetRenderViewHost()->GetWidget(),
+        blink::WebMouseEvent::Button::kLeft, 200, 20);
     content::SimulateKeyPress(embedder_web_contents, ui::DomKey::TAB,
                               ui::DomCode::TAB, ui::VKEY_TAB, false, false,
                               false, false);
@@ -1294,11 +1298,11 @@ IN_PROC_BROWSER_TEST_F(WebViewFocusInteractiveTest, Focus_FocusRestored) {
 
   // |text_input_client| is not available for mac and android.
 #if !defined(OS_MAC) && !defined(OS_ANDROID)
-  ui::TextInputClient* text_input_client =
-      embedder_web_contents->GetRenderViewHost()
-          ->GetWidget()
-          ->GetView()
-          ->GetTextInputClient();
+  ui::TextInputClient* text_input_client = embedder_web_contents->GetMainFrame()
+                                               ->GetRenderViewHost()
+                                               ->GetWidget()
+                                               ->GetView()
+                                               ->GetTextInputClient();
   ASSERT_TRUE(text_input_client);
   ASSERT_TRUE(text_input_client->GetTextInputType() !=
               ui::TEXT_INPUT_TYPE_NONE);
@@ -1319,11 +1323,11 @@ IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, MAYBE_Focus_InputMethod) {
                    &embedder_web_contents));
   ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 
-  ui::TextInputClient* text_input_client =
-      embedder_web_contents->GetRenderViewHost()
-          ->GetWidget()
-          ->GetView()
-          ->GetTextInputClient();
+  ui::TextInputClient* text_input_client = embedder_web_contents->GetMainFrame()
+                                               ->GetRenderViewHost()
+                                               ->GetWidget()
+                                               ->GetView()
+                                               ->GetTextInputClient();
   ASSERT_TRUE(text_input_client);
 
   ExtensionTestMessageListener next_step_listener("TEST_STEP_PASSED", false);