Start using RenderFrameProxyHost objects.

content/renderer/render_frame_proxy.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
 #define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
@@ skipping 71 matching lines @@
 
   virtual ~RenderFrameProxy();
 
   // IPC::Sender
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Out-of-process child frames receive a signal from RenderWidgetCompositor
   // when a compositor frame has committed.
   void DidCommitCompositorFrame();
 
-  int routing_id() const { return routing_id_; }
-  RenderViewImpl* render_view() const { return render_view_; }
-  blink::WebFrame* web_frame() const { return web_frame_; }
+  int routing_id() { return routing_id_; }
+  RenderViewImpl* render_view() { return render_view_; }
+  blink::WebRemoteFrame* web_frame() { return web_frame_; }
 
  private:
   RenderFrameProxy(int routing_id, int frame_routing_id);
 
-  void Init(blink::WebFrame* frame, RenderViewImpl* render_view);
+  void Init(blink::WebRemoteFrame* frame, RenderViewImpl* render_view);
 
   // IPC::Listener
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // IPC handlers
   void OnDeleteProxy();
   void OnChildFrameProcessGone();
   void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params);
   void OnCompositorFrameSwapped(const IPC::Message& message);
 
   // The routing ID by which this RenderFrameProxy is known.
   const int routing_id_;
 
   // The routing ID of the local RenderFrame (if any) which this
   // RenderFrameProxy is meant to replace in the frame tree.
   const int frame_routing_id_;
 
-  // Stores the WebFrame we are associated with.
-  // TODO(nick): Make this always a WebRemoteFrame.
-  blink::WebFrame* web_frame_;
+  // Stores the WebRemoteFrame we are associated with.
+  blink::WebRemoteFrame* web_frame_;
   scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
 
   RenderViewImpl* render_view_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
 };
 
 }  // namespace
 
 #endif  // CONTENT_RENDERER_RENDER_FRAME_PROXY_H_