Remove usage of HostZoomMap from c/b/loader via ReadyToCommitNavigation

content/renderer/render_frame_impl.h

Index: content/renderer/render_frame_impl.h
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 9523dbc4a089b87782057af8c1834e5cafadc8e2..9c943179148c83d43fde56b1aac62612d29d63f9 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -26,6 +26,7 @@
 #include "content/common/associated_interface_registry_impl.h"
 #include "content/common/frame.mojom.h"
 #include "content/common/frame_message_enums.h"
+#include "content/common/host_zoom.mojom.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/common/javascript_message_type.h"
 #include "content/public/common/referrer.h"
@@ -39,6 +40,7 @@
 #include "media/blink/webmediaplayer_delegate.h"
 #include "media/blink/webmediaplayer_params.h"
 #include "media/mojo/interfaces/remoting.mojom.h"
+#include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
@@ -170,6 +172,7 @@ struct StreamOverrideParameters;
 class CONTENT_EXPORT RenderFrameImpl
     : public RenderFrame,
       NON_EXPORTED_BASE(mojom::Frame),
+      NON_EXPORTED_BASE(mojom::HostZoom),
       NON_EXPORTED_BASE(public blink::WebFrameClient),
       NON_EXPORTED_BASE(public blink::WebFrameSerializerClient) {
  public:
@@ -449,6 +452,11 @@ class CONTENT_EXPORT RenderFrameImpl
   void GetInterfaceProvider(
       shell::mojom::InterfaceProviderRequest request) override;
 
+  // mojom::HostZoom implementation
+  void SetHostZoomLevel(const GURL& url, double zoom_level) override;
+

[nasko, 2016/10/17 22:49:03]

nit: Do we need the empty line here?

[scottmg, 2016/10/25 20:12:40]

It's not part of mojom::HostZoom. Moved it up near RegisterMojoInterfaces()
instead.

+  void OnHostZoomClientRequest(mojom::HostZoomAssociatedRequest request);
+
   // blink::WebFrameClient implementation:
   blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame,
                                  const blink::WebPluginParams& params) override;
@@ -713,6 +721,7 @@ class CONTENT_EXPORT RenderFrameImpl
   FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate);
   FRIEND_TEST_ALL_PREFIXES(RenderAccessibilityImplTest,
                            AccessibilityMessagesQueueWhileSwappedOut);
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameImplTest, ZoomLimit);
 
   // A wrapper class used as the callback for JavaScript executed
   // in an isolated world.
@@ -1290,8 +1299,11 @@ class CONTENT_EXPORT RenderFrameImpl
   PepperPluginInstanceImpl* pepper_last_mouse_event_target_;
 #endif
 
+  HostZoomLevels host_zoom_levels_;
+
   mojo::Binding<mojom::Frame> frame_binding_;
   mojom::FrameHostPtr frame_host_;
+  mojo::AssociatedBinding<mojom::HostZoom> host_zoom_binding_;

[nasko, 2016/10/17 22:49:03]

nit: Move it above the FrameHostPtr, so all mojo::*Binding are grouped together.

[scottmg, 2016/10/25 20:12:40]

Done.

 
   // Indicates whether |didAccessInitialDocument| was called.
   bool has_accessed_initial_document_;