Fix RenderProcessHostUnitTest.RendererProcessLimit to pass with --site-per-process

content/browser/renderer_host/render_process_host_unittest.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 <limits>
 
+#include "base/command_line.h"
 #include "content/public/common/content_constants.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 
 namespace content {
 
 class RenderProcessHostUnitTest : public RenderViewHostTestHarness {};
 
 // Tests that guest RenderProcessHosts are not considered suitable hosts when
 // searching for RenderProcessHost.
 TEST_F(RenderProcessHostUnitTest, GuestsAreNotSuitableHosts) {
   GURL test_url("http://foo.com");
 
   MockRenderProcessHost guest_host(browser_context());
   guest_host.set_is_isolated_guest(true);
 
   EXPECT_FALSE(RenderProcessHostImpl::IsSuitableHost(
       &guest_host, browser_context(), test_url));
   EXPECT_TRUE(RenderProcessHostImpl::IsSuitableHost(
       process(), browser_context(), test_url));
   EXPECT_EQ(
       process(),
       RenderProcessHost::GetExistingProcessHost(browser_context(), test_url));
 }
 
 #if !defined(OS_ANDROID)
 TEST_F(RenderProcessHostUnitTest, RendererProcessLimit) {
+  // This test shouldn't run with --site-per-process mode, since it doesn't
+  // allow renderer process reuse, which this test explicitly exercises.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(

[ppi, 2014/09/25 08:36:59]

The condition that disables the process reuse in RenderProcessHost is actually:

  if (command_line.HasSwitch(switches::kEnableStrictSiteIsolation) ||
      command_line.HasSwitch(switches::kSitePerProcess))

- would it make sense to match it here (i.e. disable for
kEnableStrictSiteIsolation as well) ?

+          switches::kSitePerProcess))
+    return;
+
   // Disable any overrides.
   RenderProcessHostImpl::SetMaxRendererProcessCount(0);
 
   // Verify that the limit is between 1 and kMaxRendererProcessCount.
   EXPECT_GT(RenderProcessHostImpl::GetMaxRendererProcessCount(), 0u);
   EXPECT_LE(RenderProcessHostImpl::GetMaxRendererProcessCount(),
       kMaxRendererProcessCount);
 
   // Add dummy process hosts to saturate the limit.
   ASSERT_NE(0u, kMaxRendererProcessCount);
@@ skipping 26 matching lines @@
   }
 
   // Verify that the renderer sharing still won't happen.
   GURL test_url("http://foo.com");
   EXPECT_FALSE(RenderProcessHostImpl::ShouldTryToUseExistingProcessHost(
         browser_context(), test_url));
 }
 #endif
 
 }  // namespace content