Move more code behind IsSwappedOutStateForbidden() checks.

content/browser/frame_host/render_frame_host_manager.cc

 // Copyright 2013 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/browser/frame_host/render_frame_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 868 matching lines @@
           switches::kSitePerProcess))
     return;
 
   for (const auto& pair : proxy_hosts_) {
     pair.second->Send(
         new FrameMsg_DidUpdateName(pair.second->GetRoutingID(), 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_) {
     pair.second->Send(
         new FrameMsg_DidUpdateOrigin(pair.second->GetRoutingID(), origin));
   }
 }
 
 void RenderFrameHostManager::Observe(
     int type,
@@ skipping 636 matching lines @@
       if (swapped_out)
         proxy->set_render_frame_proxy_created(true);
       if (frame_tree_node_->IsMainFrame()) {
         // Don't show the main frame's view until we get a DidNavigate from it.
         // Only the RenderViewHost for the top-level RenderFrameHost has a
         // RenderWidgetHostView; RenderWidgetHosts for out-of-process iframes
         // will be created later and hidden.
         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());
       }
     }
 
     if (success) {
       if (view_routing_id_ptr)
         *view_routing_id_ptr = render_view_host->GetRoutingID();
     }
@@ skipping 678 matching lines @@
     frame_tree->root()->render_manager()->
         CreateRenderFrame(instance, nullptr, opener_route_id,
                           CREATE_RF_FOR_MAIN_FRAME_NAVIGATION |
                           CREATE_RF_SWAPPED_OUT | CREATE_RF_HIDDEN,
                           &render_view_routing_id);
   }
   return render_view_routing_id;
 }
 
 }  // namespace content