Remove access to WebContents in RWHVA::SynchronousFrameMetadata()

content/browser/web_contents/web_contents_view_android.cc

Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index e3b9d4ad53631b2a91caa1b4e1aa2bd54264310e..d118e64ab4d7b0c7434d9f28188a43960b922d27 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -29,6 +29,20 @@ using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
+RenderWidgetHostViewAndroidDelegateImpl::
+RenderWidgetHostViewAndroidDelegateImpl(WebContentsImpl* web_contents)
+    : web_contents_(web_contents) {}
+
+bool RenderWidgetHostViewAndroidDelegateImpl::ShowingInterstitialPage() {
+  return web_contents_->ShowingInterstitialPage();
+}
+
+scoped_refptr<DevToolsAgentHost>
+RenderWidgetHostViewAndroidDelegateImpl::GetDevToolsAgentHost() {
+  return DevToolsAgentHost::HasFor(web_contents_) ?
+      DevToolsAgentHost::GetOrCreateFor(web_contents_) : nullptr;
+}
+
 // static
 void WebContentsView::GetDefaultScreenInfo(ScreenInfo* results) {
   const display::Display& display =
@@ -184,13 +198,14 @@ RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForWidget(
   // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
   // example of how this is achieved for InterstitialPages.
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  return new RenderWidgetHostViewAndroid(rwhi, content_view_core_);
+  return new RenderWidgetHostViewAndroid(rwhi, content_view_core_,
+      new RenderWidgetHostViewAndroidDelegateImpl(web_contents_));
 }
 
 RenderWidgetHostViewBase* WebContentsViewAndroid::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  return new RenderWidgetHostViewAndroid(rwhi, NULL);
+  return new RenderWidgetHostViewAndroid(rwhi, nullptr, nullptr);
 }
 
 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) {