Re-enable SitePerProcessBrowserTest.CrossSiteIframe

content/renderer/render_frame_proxy.cc

Index: content/renderer/render_frame_proxy.cc
diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
index 14670716dfee75ba73d6c658a4e90db05bc3f45d..915e7da4e5bf85a3dd43afb1a54f35699a43fe58 100644
--- a/content/renderer/render_frame_proxy.cc
+++ b/content/renderer/render_frame_proxy.cc
@@ -39,16 +39,10 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
   scoped_ptr<RenderFrameProxy> proxy(
       new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID()));
 
-  blink::WebRemoteFrame* web_frame = NULL;
-  if (frame_to_replace->GetWebFrame()->parent() &&
-      frame_to_replace->GetWebFrame()->parent()->isWebRemoteFrame()) {
-    blink::WebRemoteFrame* parent_web_frame =
-        frame_to_replace->GetWebFrame()->parent()->toWebRemoteFrame();
-    web_frame = parent_web_frame->createRemoteChild("", proxy.get());
-  } else {
-    web_frame = blink::WebRemoteFrame::create(proxy.get());
-  }
-
+  // When a RenderFrame will be replaced by a RenderProxy, the WebRemoteFrame

[Charlie Reis, 2014/08/19 21:32:32]

nit: will be -> is

[nasko, 2014/08/20 14:15:17]

Done.

+  // should always come from WebRemoteFrame::create and a call to WebFrame::swap
+  // must follow later.
+  blink::WebRemoteFrame* web_frame = blink::WebRemoteFrame::create(proxy.get());

[Charlie Reis, 2014/08/19 21:32:32]

I don't fully understand why the old code was unnecessary.  If that case isn't
reachable, is there a DCHECK we could add?  Or was it just wrong before?

[nasko, 2014/08/20 14:15:17]

It was just wrong before. It was hitting an ASSERT in WebFrame::swap, which
expects a WebRemoteFrame to be created through ::create instead of
::createRemoteChild.

[Charlie Reis, 2014/08/20 17:09:37]

Acknowledged.

   proxy->Init(web_frame, frame_to_replace->render_view());
   return proxy.release();
 }