Remove SiteIsolationPolicy::IsSwappedOutStateForbidden().

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 677 matching lines @@
       "rvinit_main_frame_id", base::IntToString(params.main_frame_routing_id));
 
   if (params.main_frame_routing_id != MSG_ROUTING_NONE) {
     main_render_frame_ = RenderFrameImpl::CreateMainFrame(
         this, params.main_frame_routing_id, params.main_frame_widget_routing_id,
         params.hidden, screen_info(), compositor_deps_, opener_frame);
   }
 
   if (params.proxy_routing_id != MSG_ROUTING_NONE) {
     CHECK(params.swapped_out);
-    if (main_render_frame_) {
-      CHECK(!SiteIsolationPolicy::IsSwappedOutStateForbidden());
-      RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
-          main_render_frame_, params.proxy_routing_id,
-          blink::WebTreeScopeType::Document);
-      main_render_frame_->set_render_frame_proxy(proxy);
-    } else {
-      CHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden());
-      RenderFrameProxy::CreateFrameProxy(
-          params.proxy_routing_id, routing_id(), params.opener_frame_route_id,
-          MSG_ROUTING_NONE, params.replicated_frame_state);
-    }
+    RenderFrameProxy::CreateFrameProxy(
+        params.proxy_routing_id, routing_id(), params.opener_frame_route_id,
+        MSG_ROUTING_NONE, params.replicated_frame_state);
   }
 
   if (main_render_frame_)
     main_render_frame_->Initialize();
 
 #if defined(OS_ANDROID)
   content_detectors_.push_back(make_scoped_ptr(new AddressDetector()));
   const std::string& contry_iso =
       params.renderer_preferences.network_contry_iso;
   if (!contry_iso.empty()) {
@@ skipping 2820 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 }  // namespace content