Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index eb9971320db4aaff0a97e71a2efcc757be981ee0..214cddc4ed3d942ba34a67a809cac41d78481961 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -731,7 +731,10 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params, |
ApplyWebPreferences(webkit_preferences_, webview()); |
RenderFrameProxy* proxy = NULL; |
- if (params.proxy_routing_id != MSG_ROUTING_NONE) { |
+ if (params.proxy_routing_id != MSG_ROUTING_NONE && |
+ // Do not create a proxy here if this is a swapped out RenderView for |
+ // a guest. The proxy will be created in RenderFrameImpl::OnSwapOut(). |
+ !params.is_guest) { |
CHECK(params.swapped_out); |
proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
main_render_frame_.get(), params.proxy_routing_id); |