Revert 271461 "Decouple RVH creation from CrossProcessFrameConne..."

trunk/src/content/browser/web_contents/web_contents_impl.cc

Index: trunk/src/content/browser/web_contents/web_contents_impl.cc
===================================================================
--- trunk/src/content/browser/web_contents/web_contents_impl.cc	(revision 271515)
+++ trunk/src/content/browser/web_contents/web_contents_impl.cc	(working copy)
@@ -3896,7 +3896,7 @@
     RenderViewHost* render_view_host,
     int opener_route_id,
     int proxy_routing_id,
-    bool for_main_frame) {
+    CrossProcessFrameConnector* frame_connector) {
   TRACE_EVENT0("browser", "WebContentsImpl::CreateRenderViewForRenderManager");
   // Can be NULL during tests.
   RenderWidgetHostViewBase* rwh_view;
@@ -3904,9 +3904,10 @@
   // until RenderWidgetHost is attached to RenderFrameHost. We need to special
   // case this because RWH is still a base class of RenderViewHost, and child
   // frame RWHVs are unique in that they do not have their own WebContents.
-  if (!for_main_frame) {
+  if (frame_connector) {
     RenderWidgetHostViewChildFrame* rwh_view_child =
         new RenderWidgetHostViewChildFrame(render_view_host);
+    frame_connector->set_view(rwh_view_child);
     rwh_view = rwh_view_child;
   } else {
     rwh_view = view_->CreateViewForWidget(render_view_host);