Introduce support for origins that require process isolation.

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 6e3c531d73a7c858b41f65ee023f2442e20626a6..d5bc200789b1bc8744859fcba91f799a800207e0 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -22,6 +22,7 @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_features.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
@@ -350,3 +351,78 @@ IN_PROC_BROWSER_TEST_F(HostedAppVsTdiTest, ProcessAllocation) {
     // |diff_dir| and/or |same_site|).
   }
 }
+
+class HostedAppWithIsolatedOriginsTest : public HostedAppTest {
+ public:
+  HostedAppWithIsolatedOriginsTest() {}
+  ~HostedAppWithIsolatedOriginsTest() override {}
+
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
+    std::string origin_list =
+        embedded_test_server()->GetURL("isolated.foo.com", "/").spec();
+    command_line->AppendSwitchASCII(switches::kIsolateOrigins, origin_list);
+  }
+
+  void SetUpOnMainThread() override {
+    HostedAppTest::SetUpOnMainThread();
+    host_resolver()->AddRule("*", "127.0.0.1");
+    embedded_test_server()->StartAcceptingConnections();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(HostedAppWithIsolatedOriginsTest);
+};
+
+// Verify that when navigating to an isolated origin which is also part of
+// a hosted app's web extent, the isolated origin takes precedence for
+// SiteInstance determination and still ends up in a dedicated process.
+IN_PROC_BROWSER_TEST_F(HostedAppWithIsolatedOriginsTest,
+                       IsolatedOriginTakesPrecedence) {
+  // Launch a hosted app which covers an isolated origin in its web extent.
+  GURL url = embedded_test_server()->GetURL("app.foo.com", "/iframe.html");
+  extensions::TestExtensionDir test_app_dir;
+  test_app_dir.WriteManifest(base::StringPrintf(
+      R"( { "name": "Hosted App vs IsolatedOrigins Test",
+            "version": "1",
+            "manifest_version": 2,
+            "app": {
+              "launch": {
+                "web_url": "%s"
+              },
+              "urls": ["*://isolated.foo.com/"]

[Charlie Reis, 2017/05/19 00:10:18]

Do we need to include app.foo.com in here as well?

[alexmos, 2017/05/24 00:19:56]

Done.  Reading the docs (https://developer.chrome.com/webstore/hosted_apps),
this might not be technically needed:
"urls:
The URLs for the pages in the hosted app, not necessarily including the launch
page. Once the app is installed, these pages and the launch page have the
permissions requested in the manifest."

I.e., the launch URL will be appended to this list.  But I agree it makes more
sense to just include it.

+            }
+          } )",
+      url.spec().c_str()));
+  SetupApp(test_app_dir.UnpackedPath(), false);
+
+  content::WebContents* app_contents =
+      app_browser_->tab_strip_model()->GetActiveWebContents();
+  content::WaitForLoadStop(app_contents);
+
+  content::RenderFrameHost* app = app_contents->GetMainFrame();
+
+  // A subframe on an app for an isolated origin should be kicked out to its
+  // own process.
+  GURL isolated_url =
+      embedded_test_server()->GetURL("isolated.foo.com", "/title1.html");
+  EXPECT_TRUE(NavigateIframeToURL(app_contents, "test", isolated_url));
+
+  content::RenderFrameHost* app_subframe = content::ChildFrameAt(app, 0);
+  EXPECT_EQ(isolated_url, app_subframe->GetLastCommittedURL());
+  EXPECT_TRUE(app_subframe->IsCrossProcessSubframe());
+  EXPECT_NE(app->GetSiteInstance(), app_subframe->GetSiteInstance());
+  EXPECT_EQ(isolated_url.GetOrigin(),
+            app_subframe->GetSiteInstance()->GetSiteURL());
+
+  // Navigating a regular tab to an isolated origin which is also part of an
+  // app's web extent should use the isolated origin's SiteInstance and not the
+  // app's.
+  ui_test_utils::NavigateToURL(browser(), isolated_url);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();

[Charlie Reis, 2017/05/19 00:10:18]

Oh, weird.  I didn't realize at first that app_browser_ was different from
browser(), which made this look a bit odd.  But I guess that's consistent with
this whole file, so I'm ok with it.

+  EXPECT_EQ(isolated_url.GetOrigin(),
+            web_contents->GetMainFrame()->GetSiteInstance()->GetSiteURL());
+  EXPECT_NE(web_contents->GetMainFrame()->GetSiteInstance(),
+            app->GetSiteInstance());
+}