[Master/Overview CL] Make PageScaleFactor work for oopif subframe.

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 6e2b3b48dc76cc2e7736a0ce95500cee3f58c665..def6d5d411422ac5ec1f8ed671ea8fa2225a8177 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -260,7 +260,7 @@ class CONTENT_EXPORT RenderFrameImpl
 
   // TODO(jam): this is a temporary getter until all the code is transitioned
   // to using RenderFrame instead of RenderView.
-  RenderViewImpl* render_view() { return render_view_.get(); }
+  RenderViewImpl* render_view() { return render_view_; }
 
   const blink::WebHistoryItem& current_history_item() {
     return current_history_item_;
@@ -603,6 +603,7 @@ class CONTENT_EXPORT RenderFrameImpl
                                 v8::Local<v8::Context> context,
                                 int world_id) override;
   void didChangeScrollOffset(blink::WebLocalFrame* frame) override;
+  void didRestorePageScaleFactorOnLoad(float page_scale) override;
   void willInsertBody(blink::WebLocalFrame* frame) override;
   void reportFindInPageMatchCount(int request_id,
                                   int count,
@@ -1107,7 +1108,7 @@ class CONTENT_EXPORT RenderFrameImpl
   // Blink Web* layer to check for provisional frames.
   bool in_frame_tree_;
 
-  base::WeakPtr<RenderViewImpl> render_view_;
+  RenderViewImpl* render_view_;
   int routing_id_;
 
   // If this frame was created to replace a proxy, this will store the routing