Factor out RenderWidgetHostConnector

content/browser/android/render_widget_host_connector.cc

Index: content/browser/android/render_widget_host_connector.cc
diff --git a/content/browser/android/render_widget_host_connector.cc b/content/browser/android/render_widget_host_connector.cc
new file mode 100644
index 0000000000000000000000000000000000000000..bb6a354355692d7fc7db614012b81aa9dde0bb78
--- /dev/null
+++ b/content/browser/android/render_widget_host_connector.cc
@@ -0,0 +1,52 @@
+// Copyright 2017 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/android/render_widget_host_connector.h"
+
+#include "content/browser/frame_host/interstitial_page_impl.h"
+#include "content/browser/renderer_host/render_widget_host_view_android.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+
+namespace content {
+
+RenderWidgetHostConnector::RenderWidgetHostConnector(WebContents* web_contents)
+    : WebContentsObserver(web_contents) {}
+
+RenderWidgetHostConnector::~RenderWidgetHostConnector() {}
+
+void RenderWidgetHostConnector::RenderViewHostChanged(
+    RenderViewHost* old_host,
+    RenderViewHost* new_host) {
+  auto* old_view = old_host ? static_cast<RenderWidgetHostViewAndroid*>(
+                                  old_host->GetWidget()->GetView())
+                            : nullptr;
+  auto* new_view = new_host ? static_cast<RenderWidgetHostViewAndroid*>(
+                                  new_host->GetWidget()->GetView())
+                            : nullptr;
+  if (old_view != new_view)
+    UpdateRenderWidgetHostView(old_view, new_view);
+}
+
+void RenderWidgetHostConnector::WebContentsDestroyed() {
+  auto* rwhva = GetRenderWidgetHostView();
+  if (rwhva != nullptr)
+    UpdateRenderWidgetHostView(rwhva, nullptr);
+}
+
+RenderWidgetHostViewAndroid*
+RenderWidgetHostConnector::GetRenderWidgetHostView() const {
+  RenderWidgetHostView* rwhv = web_contents()->GetRenderWidgetHostView();
+  WebContentsImpl* web_contents_impl =
+      static_cast<WebContentsImpl*>(web_contents());
+  if (web_contents_impl->ShowingInterstitialPage()) {
+    rwhv = web_contents_impl->GetInterstitialPage()
+               ->GetMainFrame()
+               ->GetRenderViewHost()
+               ->GetWidget()
+               ->GetView();
+  }
+  return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
+}
+
+}  // namespace content