Hosted apps VS --site-per-process.

chrome/browser/ui/extensions/hosted_app_browsertest.cc

Index: chrome/browser/ui/extensions/hosted_app_browsertest.cc
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
index ff1f39d815cd4218953be6c3256ea97538055d5e..2a646536f7dcde4b187ccd637d5927df75ce936c 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -284,35 +284,6 @@ IN_PROC_BROWSER_TEST_F(HostedAppVsTdiTest, ProcessAllocation) {
   content::RenderFrameHost* cross_site = find_frame("CrossSite");
 
   //
-  // Sanity-check sites of all relevant frames to verify test setup.
-  //
-
-  GURL app_site = content::SiteInstance::GetSiteForURL(
-      app_browser_->profile(), app->GetLastCommittedURL());
-  EXPECT_EQ(extensions::kExtensionScheme, app_site.scheme());
-
-  GURL same_dir_site = content::SiteInstance::GetSiteForURL(
-      app_browser_->profile(), same_dir->GetLastCommittedURL());
-  EXPECT_EQ(extensions::kExtensionScheme, same_dir_site.scheme());
-  EXPECT_EQ(same_dir_site, app_site);
-
-  GURL diff_dir_site = content::SiteInstance::GetSiteForURL(
-      app_browser_->profile(), diff_dir->GetLastCommittedURL());
-  EXPECT_NE(extensions::kExtensionScheme, diff_dir_site.scheme());
-  EXPECT_NE(diff_dir_site, app_site);
-
-  GURL same_site_site = content::SiteInstance::GetSiteForURL(
-      app_browser_->profile(), same_site->GetLastCommittedURL());
-  EXPECT_NE(extensions::kExtensionScheme, same_site_site.scheme());
-  EXPECT_NE(same_site_site, app_site);
-  EXPECT_EQ(same_site_site, diff_dir_site);
-
-  GURL cross_site_site = content::SiteInstance::GetSiteForURL(
-      app_browser_->profile(), cross_site->GetLastCommittedURL());
-  EXPECT_NE(cross_site_site, app_site);
-  EXPECT_NE(cross_site_site, same_site_site);
-
-  //
   // Verify that |same_dir| and |diff_dir| can script each other.
   // (they should - they have the same origin).
   //
@@ -344,6 +315,7 @@ IN_PROC_BROWSER_TEST_F(HostedAppVsTdiTest, ProcessAllocation) {
   EXPECT_EQ(same_dir->GetProcess(), app->GetProcess());
   EXPECT_EQ(diff_dir->GetProcess(), app->GetProcess());
   EXPECT_EQ(same_site->GetProcess(), app->GetProcess());
-  // For now it is okay for |cross_site| to be in any process - see
-  // https://crbug.com/679011#c2.
+  if (content::AreAllSitesIsolatedForTesting()) {
+    EXPECT_NE(same_site->GetProcess(), cross_site->GetProcess());
+  }
 }