Make --site-per-process override --process-per-tab in RFHM::ShouldTransitionCrossSite

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 4a9034b51560718045abcf988cde7a79027070ab..e6ccb160fae04b3ccedb1e4feb662e90d0a9172c 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -848,6 +848,11 @@ bool RenderFrameHostManager::ShouldTransitionCrossSite() {
   // in swapped_out_hosts_.
   // True if we are using process-per-site-instance (default) or
   // process-per-site (kProcessPerSite).
+  // True for --site-per-process, which overrides both kSingleProcess and

[Charlie Reis, 2015/02/05 17:57:53]

nit: Let's move this block above the first comment, so that it's the first thing
in the function.

[alexmos, 2015/02/05 18:01:11]

Done.

+  // kProcessPerTab.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kSitePerProcess))
+    return true;
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kSingleProcess) &&
          !base::CommandLine::ForCurrentProcess()->HasSwitch(