Change Isolate Extensions to be off by default.

chrome/browser/extensions/process_manager_browsertest.cc

Index: chrome/browser/extensions/process_manager_browsertest.cc
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc
index 97822afa7a200b2900c08a943df3c5aa60090f90..dcdf590113503cb6c8cc1855fd695f3bb032aa58 100644
--- a/chrome/browser/extensions/process_manager_browsertest.cc
+++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -713,45 +713,48 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest,
 
   // Validate that permissions have been granted for the extension scheme
   // to the process of the extension iframe.
-  content::ChildProcessSecurityPolicy* policy =
-      content::ChildProcessSecurityPolicy::GetInstance();
-  EXPECT_TRUE(policy->CanRequestURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("blob:chrome-extension://some-extension-id/some-guid")));
-  EXPECT_TRUE(policy->CanRequestURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("blob:chrome-extension://some-extension-id/some-guid")));
-  EXPECT_TRUE(policy->CanRequestURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("filesystem:chrome-extension://some-extension-id/some-path")));
-  EXPECT_TRUE(policy->CanRequestURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("filesystem:chrome-extension://some-extension-id/some-path")));
-  EXPECT_TRUE(policy->CanRequestURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("chrome-extension://some-extension-id/resource.html")));
-  EXPECT_TRUE(policy->CanRequestURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("chrome-extension://some-extension-id/resource.html")));
-
-  EXPECT_TRUE(policy->CanCommitURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("blob:chrome-extension://some-extension-id/some-guid")));
-  EXPECT_FALSE(policy->CanCommitURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("blob:chrome-extension://some-extension-id/some-guid")));
-  EXPECT_TRUE(policy->CanCommitURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("chrome-extension://some-extension-id/resource.html")));
-  EXPECT_FALSE(policy->CanCommitURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("chrome-extension://some-extension-id/resource.html")));
-  EXPECT_TRUE(policy->CanCommitURL(
-      extension_frame->GetProcess()->GetID(),
-      GURL("filesystem:chrome-extension://some-extension-id/some-path")));
-  EXPECT_FALSE(policy->CanCommitURL(
-      main_frame->GetProcess()->GetID(),
-      GURL("filesystem:chrome-extension://some-extension-id/some-path")));
+  // Note: this is only valid when --isolate-extensions is enabled.

[ncarter (slow), 2016/10/28 21:49:53]

Omit this comment, for cleaner merges.

[nasko, 2016/10/29 17:02:41]

Done.

+  if (extensions::IsIsolateExtensionsEnabled()) {

[nasko, 2016/10/28 21:18:42]

All of the following checks were added as part of Nick's CL, so I put them all
in one block to keep parity with before.

[ncarter (slow), 2016/10/28 21:49:53]

In the branches, "if (extensions::IsIsolateExtensionsEnabled()) {" is already
present, but it's only around the second, CanCommitURL group of statements. Alex
also has a pending CL that will reintroduce it this way.

[Charlie Reis, 2016/10/28 23:46:33]

+1 to matching Alex's https://codereview.chromium.org/2454563003/ for this part
of the patch.

(Side note, of no consequence: I'm finding the Rietveld diff fascinating, in
terms of light green vs dark green.  I wonder why it treats the EXPECT_TRUE
lines as modified rather than just indented.)

[nasko, 2016/10/29 17:02:41]

Done.

+    content::ChildProcessSecurityPolicy* policy =
+        content::ChildProcessSecurityPolicy::GetInstance();
+    EXPECT_TRUE(policy->CanRequestURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("blob:chrome-extension://some-extension-id/some-guid")));
+    EXPECT_TRUE(policy->CanRequestURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("blob:chrome-extension://some-extension-id/some-guid")));
+    EXPECT_TRUE(policy->CanRequestURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("filesystem:chrome-extension://some-extension-id/some-path")));
+    EXPECT_TRUE(policy->CanRequestURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("filesystem:chrome-extension://some-extension-id/some-path")));
+    EXPECT_TRUE(policy->CanRequestURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("chrome-extension://some-extension-id/resource.html")));
+    EXPECT_TRUE(policy->CanRequestURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("chrome-extension://some-extension-id/resource.html")));
+
+    EXPECT_TRUE(policy->CanCommitURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("blob:chrome-extension://some-extension-id/some-guid")));
+    EXPECT_FALSE(policy->CanCommitURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("blob:chrome-extension://some-extension-id/some-guid")));
+    EXPECT_TRUE(policy->CanCommitURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("chrome-extension://some-extension-id/resource.html")));
+    EXPECT_FALSE(policy->CanCommitURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("chrome-extension://some-extension-id/resource.html")));
+    EXPECT_TRUE(policy->CanCommitURL(
+        extension_frame->GetProcess()->GetID(),
+        GURL("filesystem:chrome-extension://some-extension-id/some-path")));
+    EXPECT_FALSE(policy->CanCommitURL(
+        main_frame->GetProcess()->GetID(),
+        GURL("filesystem:chrome-extension://some-extension-id/some-path")));
+  }
 
   // Open a new about:blank popup from main frame.  This should stay in the web
   // process.