Move more code behind IsSwappedOutStateForbidden() checks.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7fd3cd905b072a9fd03248d78d643e067224d8c3..2e1a98a1a9f7b6ab4ca5d069f9b7945a2b2a1ad7 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -709,8 +709,9 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
     }
   }
 
-  // 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.