Move more code behind IsSwappedOutStateForbidden() checks.

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 691 matching lines @@
       main_render_frame_->set_render_frame_proxy(proxy);
     } else {
       proxy = RenderFrameProxy::CreateFrameProxy(
           params.proxy_routing_id,
           MSG_ROUTING_NONE,
           routing_id_,
           params.replicated_frame_state);
     }
   }
 
-  // In --site-per-process, just use the WebRemoteFrame as the main frame.
-  if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) {
+  // When not using swapped out state, just use the WebRemoteFrame as the main
+  // frame.
+  if (proxy && RenderFrameProxy::IsSwappedOutStateForbidden()) {
     webview()->setMainFrame(proxy->web_frame());
     // Initialize the WebRemoteFrame with information replicated from the
     // browser process.
     proxy->SetReplicatedState(params.replicated_frame_state);
   } else {
     webview()->setMainFrame(main_render_frame_->GetWebFrame());
   }
   if (main_render_frame_)
     main_render_frame_->Initialize();
 
@@ skipping 3092 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content