Move more code behind IsSwappedOutStateForbidden() checks.

content/browser/frame_host/render_frame_host_manager.cc

Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 007bbba1093445f257e0efe93e9bc9bebdf92da9..8b4004ca56c11d5cca2661230b62ad7c23fa220f 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -886,8 +886,7 @@ void RenderFrameHostManager::OnDidUpdateName(const std::string& name) {
 }
 
 void RenderFrameHostManager::OnDidUpdateOrigin(const url::Origin& origin) {
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kSitePerProcess))
+  if (!IsSwappedOutStateForbidden())

[ncarter (slow), 2015/06/26 20:27:17]

I didn't realize this one fall under the SwappedOutForbidden() umbrella.

If we do this here, don't we need to do it for OnDidUpdateName too? They seem to
be following the same pattern.

[nasko, 2015/06/29 08:06:20]

I'd consult Alex on that one, as he is working through naming and opener chains
right now.

[alexmos, 2015/06/29 14:18:05]

Only if we also update this one:
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/r...

I don't see how that's related to swapped-out removal though.  Without
--site-per-process, name updates are likely already broken today (if a
cross-process window updates its window.name, I don't see how other windows in
the BrowsingInstance can reach it via its new window.name without this).  But
fixing it may not be straightforward, as there were also past issues with perf
benchmarks because of these updates (see comment where we send the
FrameHostMsg_DidChangeName).  So it seems we should resolve these separately
from swapped-out removal.

For that matter, Nasko, why this one is needed for swapped-out removal too?  I'm
guessing the latest top-level RemoteFrame origin was needed somewhere, but just
curious where.

     return;
 
   for (const auto& pair : proxy_hosts_) {
@@ -1544,12 +1543,11 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
         if (render_view_host->GetView())
           render_view_host->GetView()->Hide();
       }
-      // With --site-per-process, RenderViewHost for |instance| might exist
-      // prior to calling CreateRenderFrame, due to a subframe in
-      // |instance|. In such a case, InitRenderView will not create the
+      // RenderViewHost for |instance| might exist prior to calling
+      // CreateRenderFrame. In such a case, InitRenderView will not create the
       // RenderFrame in the renderer process and it needs to be done
       // explicitly.
-      if (is_site_per_process) {
+      if (swapped_out_forbidden) {
         // Init the RFH, so a RenderFrame is created in the renderer.
         DCHECK(new_render_frame_host);
         success = InitRenderFrame(new_render_frame_host.get());