Index: content/browser/browser_plugin/browser_plugin_guest.cc |
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc |
index b46cdf8493bf83897ded67b86c41bcc247355aba..007c9776e09b12b428b89ae2632ce5ec0c0f4ac8 100644 |
--- a/content/browser/browser_plugin/browser_plugin_guest.cc |
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc |
@@ -120,9 +120,9 @@ int BrowserPluginGuest::GetGuestProxyRoutingID() { |
if (guest_proxy_routing_id_ != MSG_ROUTING_NONE) |
return guest_proxy_routing_id_; |
- // Create a swapped out RenderView for the guest in the embedder renderer |
+ // Create a RenderFrameProxyHost for the guest in the embedder renderer |
// process, so that the embedder can access the guest's window object. |
- // On reattachment, we can reuse the same swapped out RenderView because |
+ // On reattachment, we can reuse the same RenderFrameProxyHost because |
// the embedder process will always be the same even if the embedder |
// WebContents changes. |
// |
@@ -131,17 +131,12 @@ int BrowserPluginGuest::GetGuestProxyRoutingID() { |
// |guest_proxy_routing_id_| and perform any necessary cleanup on Detach |
// to enable this. |
SiteInstance* owner_site_instance = owner_web_contents_->GetSiteInstance(); |
- if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { |
- int proxy_routing_id = |
- GetWebContents()->GetFrameTree()->root()->render_manager()-> |
- CreateRenderFrameProxy(owner_site_instance); |
- guest_proxy_routing_id_ = RenderFrameProxyHost::FromID( |
- owner_site_instance->GetProcess()->GetID(), proxy_routing_id) |
- ->GetRenderViewHost()->GetRoutingID(); |
- } else { |
- guest_proxy_routing_id_ = |
- GetWebContents()->CreateSwappedOutRenderView(owner_site_instance); |
- } |
+ int proxy_routing_id = |
+ GetWebContents()->GetFrameTree()->root()->render_manager()-> |
+ CreateRenderFrameProxy(owner_site_instance); |
+ guest_proxy_routing_id_ = RenderFrameProxyHost::FromID( |
+ owner_site_instance->GetProcess()->GetID(), proxy_routing_id) |
+ ->GetRenderViewHost()->GetRoutingID(); |
return guest_proxy_routing_id_; |
} |