Revert of Make RenderFrame(Host) own a RenderWidget(Host).

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index a8d0fb0603758a7f645037303c53b04cfc01acbc..7b40b9da8db2ce29171cdd0deb5eb32f3fcfcf0d 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -60,9 +60,7 @@
 class RenderFrameProxyHost;
 class RenderProcessHost;
 class RenderViewHostImpl;
-class RenderWidgetHostDelegate;
 class RenderWidgetHostImpl;
-class RenderWidgetHostView;
 class StreamHandle;
 class TimeoutMonitor;
 struct CommitNavigationParams;
@@ -81,11 +79,7 @@
   // top-level frame.
   CREATE_RF_FOR_MAIN_FRAME_NAVIGATION = 1 << 1,
   // The RenderFrame is initially hidden.
-  CREATE_RF_HIDDEN = 1 << 2,
-  // The RenderFrameHost will have a new RenderWidgetHost created and
-  // attached to it. This is used when the RenderFrameHost is in a different
-  // process from its parent frame.
-  CREATE_RF_NEEDS_RENDER_WIDGET_HOST = 1 << 3
+  CREATE_RF_HIDDEN = 1 << 2
 };
 
 class CONTENT_EXPORT RenderFrameHostImpl
@@ -183,7 +177,9 @@
   // Tracks whether the RenderFrame for this RenderFrameHost has been created in
   // the renderer process.  This is currently only used for subframes.
   // TODO(creis): Use this for main frames as well when RVH goes away.
-  void SetRenderFrameCreated(bool created);
+  void set_render_frame_created(bool created) {
+    render_frame_created_ = created;
+  }
 
   // Called for renderer-created windows to resume requests from this frame,
   // after they are blocked in RenderWidgetHelper::CreateNewWindow.
@@ -197,16 +193,9 @@
   RenderViewHostImpl* render_view_host() { return render_view_host_; }
   RenderFrameHostDelegate* delegate() { return delegate_; }
   FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
-
-  // This returns the RenderFrameHost's owned RenderWidgetHost if it has one,
-  // or else it returns nullptr.
-  // If the RenderFrameHost is the page's main frame, this returns instead a
-  // pointer to the RenderViewHost (which inherits RenderWidgetHost).
+  // TODO(nasko): The RenderWidgetHost will be owned by RenderFrameHost in
+  // the future, so update this accessor to return the right pointer.
   RenderWidgetHostImpl* GetRenderWidgetHost();
-
-  // This returns the RenderWidgetHostView that can be used to control
-  // focus and visibility for this frame.
-  RenderWidgetHostView* GetView();
 
   // This function is called when this is a swapped out RenderFrameHost that
   // lives in the same process as the parent frame. The
@@ -412,7 +401,6 @@
   // into WebContentsObserver::FrameDetached for now.
   RenderFrameHostImpl(RenderViewHostImpl* render_view_host,
                       RenderFrameHostDelegate* delegate,
-                      RenderWidgetHostDelegate* rwh_delegate,
                       FrameTree* frame_tree,
                       FrameTreeNode* frame_tree_node,
                       int routing_id,
@@ -558,14 +546,6 @@
   // ExecuteJavaScript and their corresponding callbacks.
   std::map<int, JavaScriptResultCallback> javascript_callbacks_;
 
-  // RenderFrameHosts that need management of the rendering and input events
-  // for their frame subtrees require RenderWidgetHosts. This typically
-  // means frames that are rendered in different processes from their parent
-  // frames.
-  // TODO(kenrb): Later this will also be used on the top-level frame, when
-  // RenderFrameHost owns its RenderViewHost.
-  scoped_ptr<RenderWidgetHostImpl> render_widget_host_;
-
   int routing_id_;
 
   // The current state of this RenderFrameHost.