Add FrameHost mojo service

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 79bdb6c8e4208d92625cf513e9fa736178563dc3..736ba69cf36d84130cce44282c2e7bad1bb5d1d3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1150,6 +1150,10 @@ void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
   blame_context_->Initialize();
 }
 
+void RenderFrameImpl::OnGotZoomLevel(const GURL& url, double zoom_level) {
+  host_zoom_levels_[url] = zoom_level;
+}
+
 RenderWidget* RenderFrameImpl::GetRenderWidget() {
   RenderFrameImpl* local_root =
       RenderFrameImpl::FromWebFrame(frame_->localRoot());
@@ -3923,6 +3927,12 @@ void RenderFrameImpl::willSendRequest(
 
   if (!render_view_->renderer_preferences_.enable_referrers)
     request.setHTTPReferrer(WebString(), blink::WebReferrerPolicyDefault);
+
+  if (extra_data->is_main_frame()) {
+    frame_service_->GetHostZoomLevel(
+        request_url, base::Bind(&RenderFrameImpl::OnGotZoomLevel,
+                                weak_factory_.GetWeakPtr()));
+  }
 }
 
 void RenderFrameImpl::didReceiveResponse(
@@ -4522,7 +4532,7 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
     // Set zoom level, but don't do it for full-page plugin since they don't use
     // the same zoom settings.
     HostZoomLevels::iterator host_zoom =
-        render_view_->host_zoom_levels_.find(GURL(request.url()));
+        host_zoom_levels_.find(GURL(request.url()));
     if (render_view_->webview()->mainFrame()->isWebLocalFrame() &&
         render_view_->webview()->mainFrame()->document().isPluginDocument()) {
       // Reset the zoom levels for plugins.
@@ -4530,15 +4540,15 @@ void RenderFrameImpl::SendDidCommitProvisionalLoad(
     } else {
       // If the zoom level is not found, then do nothing. In-page navigation
       // relies on not changing the zoom level in this case.
-      if (host_zoom != render_view_->host_zoom_levels_.end())
+      if (host_zoom != host_zoom_levels_.end())
         render_view_->SetZoomLevel(host_zoom->second);
     }
 
-    if (host_zoom != render_view_->host_zoom_levels_.end()) {
+    if (host_zoom != host_zoom_levels_.end()) {
       // This zoom level was merely recorded transiently for this load.  We can
       // erase it now.  If at some point we reload this page, the browser will
       // send us a new, up-to-date zoom level.
-      render_view_->host_zoom_levels_.erase(host_zoom);
+      host_zoom_levels_.erase(host_zoom);
     }
 
     // Update contents MIME type for main frame.
@@ -6019,6 +6029,8 @@ void RenderFrameImpl::RegisterMojoServices() {
     GetServiceRegistry()->AddService(base::Bind(
         &ImageDownloaderImpl::CreateMojoService, base::Unretained(this)));
   }
+
+  GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&frame_service_));
 }
 
 template <typename Interface>