Fix process reuse for dedicated processes when over process limit.

content/browser/web_contents/web_contents_impl_unittest.cc

 // Copyright (c) 2012 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 <stdint.h>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 967 matching lines @@
   entry_id = controller().GetPendingEntry()->GetUniqueID();
   contents()->TestDidNavigate(pending_rfh, entry_id, true, url2,
                               ui::PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(
       contents()->GetRenderManager()->GetRenderFrameProxyHost(instance));
 }
 
 // Tests that WebContentsImpl uses the current URL, not the SiteInstance's site,
 // to determine whether a navigation is cross-site.
 TEST_F(WebContentsImplTest, CrossSiteComparesAgainstCurrentPage) {
+  // The assumptions this test makes aren't valid with --site-per-process.  For
+  // example, a cross-site URL won't ever commit in the old RFH.
+  if (AreAllSitesIsolatedForTesting())
+    return;
+
   TestRenderFrameHost* orig_rfh = main_test_rfh();
   SiteInstance* instance1 = contents()->GetSiteInstance();
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
   controller().LoadURL(
       url, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
   int entry_id = controller().GetPendingEntry()->GetUniqueID();
   main_test_rfh()->PrepareForCommit();
   contents()->TestDidNavigate(orig_rfh, entry_id, true, url,
@@ skipping 17 matching lines @@
                              ui::PAGE_TRANSITION_TYPED);
   SiteInstance* instance2 = contents2->GetSiteInstance();
   EXPECT_NE(instance1, instance2);
   EXPECT_FALSE(contents2->CrossProcessNavigationPending());
 
   // Simulate a link click in first contents to second site.  Doesn't switch
   // SiteInstances, because we don't intercept Blink navigations.
   orig_rfh->SendRendererInitiatedNavigationRequest(url2, true);
   orig_rfh->PrepareForCommit();
   contents()->TestDidNavigate(orig_rfh, 0, true, url2,
                               ui::PAGE_TRANSITION_TYPED);

[Charlie Reis, 2017/06/12 23:08:17]

It's unfortunate this wasn't failing already before your CL.  I suppose that's
because we aren't yet killing for committing the wrong URL, due to error pages?

(I wonder if we can start killing for illegal URLs with an exception for error
pages.  It won't provide a security boundary until we handle error pages, but it
will at least help us catch bugs in code that has the wrong expectations.)

[alexmos, 2017/06/14 22:39:05]

Yes, and that's a really good idea to start catching any other bugs with these
kills and not have the enforcement be blocked on error pages.  Let's explore
that in a followup.

   SiteInstance* instance3 = contents()->GetSiteInstance();
   EXPECT_EQ(instance1, instance3);
   EXPECT_FALSE(contents()->CrossProcessNavigationPending());
 
   // Navigate to the new site.  Doesn't switch SiteInstancees, because we
   // compare against the current URL, not the SiteInstance's site.
   const GURL url3("http://mail.yahoo.com");
   controller().LoadURL(
       url3, Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
   entry_id = controller().GetPendingEntry()->GetUniqueID();
@@ skipping 2407 matching lines @@
   // An automatic navigation.
   main_test_rfh()->SendNavigateWithModificationCallback(
       0, true, GURL(url::kAboutBlankURL), base::Bind(SetAsNonUserGesture));
 
   EXPECT_EQ(1u, dialog_manager.reset_count());
 
   contents()->SetJavaScriptDialogManagerForTesting(nullptr);
 }
 
 }  // namespace content