Enforce all subframes to be in the same BrowsingInstance as the parent.

chrome/browser/site_details_browsertest.cc

 // Copyright 2015 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 "chrome/browser/site_details.h"
 
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 1117 matching lines @@
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 1)));
   }
 
   // Load an extension without a background page, which will avoid creating a
   // BrowsingInstance for it.
   const Extension* extension1 = CreateExtension("Extension One", false);
 
   // Navigate the tab's first iframe to a resource of the extension. The
-  // extension iframe will be put in a separate BrowsingInstance (see
-  // https://crbug.com/522302) unless in the default process model.
+  // extension iframe will be put in the same BrowsingInstance as it is part
+  // of the frame tree.
   content::NavigateIframeToURL(
       tab, "child-0", extension1->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   if (content::AreAllSitesIsolatedForTesting()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
-                ElementsAre(Bucket(1, 1), Bucket(4, 1)));
+                ElementsAre(Bucket(5, 1)));
   } else if (extensions::IsIsolateExtensionsEnabled()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 2)));
   } else {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 1)));
   }
 
   // Now load an extension with a background page. This will result in a
   // BrowsingInstance for the background page.
   const Extension* extension2 = CreateExtension("Extension One", true);
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   if (content::AreAllSitesIsolatedForTesting()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
-                ElementsAre(Bucket(1, 2), Bucket(4, 1)));
+                ElementsAre(Bucket(1, 1), Bucket(5, 1)));
   } else if (extensions::IsIsolateExtensionsEnabled()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 3)));
   } else {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 2)));
   }
 
-  // Navigate the second iframe of the tab to the second extension. This will
-  // create a new BrowsingInstance again due to https://crbug.com/522302 for
-  // --site-per-process and --isolate-extensions.
+  // Navigate the second iframe of the tab to the second extension. It should
+  // stay in the same BrowsingInstance as the page.
   content::NavigateIframeToURL(
       tab, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   if (content::AreAllSitesIsolatedForTesting()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
-                ElementsAre(Bucket(1, 3), Bucket(3, 1)));
+                ElementsAre(Bucket(1, 1), Bucket(5, 1)));
   } else if (extensions::IsIsolateExtensionsEnabled()) {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 4)));
   } else {
     EXPECT_THAT(details->uma()->GetAllSamples(
                     "SiteIsolation.SiteInstancesPerBrowsingInstance"),
                 ElementsAre(Bucket(1, 2)));
   }
 }