Remove command line/field trial support and configs for Isolate Extensions.

chrome/browser/extensions/process_manager_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 228 matching lines @@
     NavigationCompletedObserver observer(
         browser()->tab_strip_model()->GetActiveWebContents());
 
     ui_test_utils::NavigateToURL(browser(), url);
 
     // Wait until the last RenderFrameHosts are deleted. This wait doesn't take
     // long.
     observer.Wait();
   }
 
-  size_t IfExtensionsIsolated(size_t if_enabled, size_t if_disabled) {
-    return content::AreAllSitesIsolatedForTesting() ||
-                   IsIsolateExtensionsEnabled()
-               ? if_enabled
-               : if_disabled;
-  }
-
   content::WebContents* OpenPopup(content::RenderFrameHost* opener,
                                   const GURL& url) {
     content::WindowedNotificationObserver popup_observer(
         chrome::NOTIFICATION_TAB_ADDED,
         content::NotificationService::AllSources());
     EXPECT_TRUE(ExecuteScript(
         opener, "window.popup = window.open('" + url.spec() + "')"));
     popup_observer.Wait();
     content::WebContents* popup =
         browser()->tab_strip_model()->GetActiveWebContents();
@@ skipping 251 matching lines @@
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
   EXPECT_EQ(0u, pm->GetAllFrames().size());
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   // Tests extension frames in non-extension page.
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension1->id()).size());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
+  EXPECT_EQ(1u, pm->GetAllFrames().size());
 
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame2", kExt2EmptyUrl));
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension2->id()).size());
-  EXPECT_EQ(IfExtensionsIsolated(2, 0), pm->GetAllFrames().size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
+  EXPECT_EQ(2u, pm->GetAllFrames().size());
 
   // Tests non-extension page in extension frame.
   NavigateToURL(kExt1TwoFramesUrl);
   // 1 top-level + 2 child frames from Extension 1.
   EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1",
                                            embedded_test_server()
                                            ->GetURL("/empty.html")));
   // 1 top-level + 1 child frame from Extension 1.
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(2u, pm->GetAllFrames().size());
 
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   // 1 top-level + 2 child frames from Extension 1.
   EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(3u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 
   // Load a frame from another extension.
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt2EmptyUrl));
   // 1 top-level + 1 child frame from Extension 1,
   // 1 child frame from Extension 2.
-  EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size());
+  EXPECT_EQ(3u, pm->GetAllFrames().size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension2->id()).size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Destroy all existing frames by navigating to another extension.
   NavigateToURL(extension2->url().Resolve("empty.html"));
   EXPECT_EQ(1u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Test about:blank and about:srcdoc child frames.
   NavigateToURL(extension2->url().Resolve("srcdoc_iframe.html"));
   // 1 top-level frame + 1 child frame from Extension 2.
@@ skipping 27 matching lines @@
   // 1 top-level + 2 child frames from Extension 1,
   // 2 child frames in frame1 from Extension 2.
   EXPECT_EQ(5u, pm->GetAllFrames().size());
   EXPECT_EQ(5u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // The extension frame from the other extension should not be classified as an
   // extension (unless out-of-process frames are enabled).
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
   // 1 top-level + 1 child frames from Extension 2,
   // 1 child frame from Extension 1.
-  EXPECT_EQ(IfExtensionsIsolated(3, 2), pm->GetAllFrames().size());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension1->id()).size());
+  EXPECT_EQ(3u, pm->GetAllFrames().size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame2", kExt1TwoFramesUrl));
   // 1 top-level + 1 child frames from Extension 2,
   // 1 child frame + 2 child frames in frame2 from Extension 1.
-  EXPECT_EQ(IfExtensionsIsolated(5, 1), pm->GetAllFrames().size());
-  EXPECT_EQ(IfExtensionsIsolated(4, 0),
-            pm->GetRenderFrameHostsForExtension(extension1->id()).size());
+  EXPECT_EQ(5u, pm->GetAllFrames().size());
+  EXPECT_EQ(4u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Crash tab where the top-level frame is an extension frame.
   content::CrashTab(tab);
   EXPECT_EQ(0u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension2->id()).size());
 
   // Now load an extension page and a non-extension page...
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), kExt1EmptyUrl, WindowOpenDisposition::NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
   EXPECT_EQ(1u, pm->GetAllFrames().size());
 
   // ... load an extension frame in the non-extension process
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", kExt1EmptyUrl));
-  EXPECT_EQ(IfExtensionsIsolated(2, 1),
-            pm->GetRenderFrameHostsForExtension(extension1->id()).size());
+  EXPECT_EQ(2u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 
   // ... and take down the tab. The extension process is not part of the tab,
   // so it should be kept alive (minus the frames that died).
   content::CrashTab(tab);
   EXPECT_EQ(1u, pm->GetAllFrames().size());
   EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension1->id()).size());
 }
 
 // Verify correct keepalive count behavior on network request events.
 // Regression test for http://crbug.com/535716.
@@ skipping 101 matching lines @@
   // Navigate main tab to a web page with two web iframes.  There should be no
   // extension frames yet.
   NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
   ProcessManager* pm = ProcessManager::Get(profile());
   EXPECT_EQ(0u, pm->GetAllFrames().size());
   EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
 
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  // Navigate first subframe to an extension URL. With --isolate-extensions,
-  // this will go into a new extension process.
+  // Navigate first subframe to an extension URL. This will go into a new
+  // extension process.
   const GURL extension_url(extension->url().Resolve("empty.html"));
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame1", extension_url));
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension->id()).size());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
+  EXPECT_EQ(1u, pm->GetAllFrames().size());
 
   content::RenderFrameHost* main_frame = tab->GetMainFrame();
   content::RenderFrameHost* extension_frame = ChildFrameAt(main_frame, 0);
 
   // 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")));
 
-  if (IsIsolateExtensionsEnabled()) {
-    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")));
-  }
+  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.
   content::WebContents* popup =
       OpenPopup(main_frame, GURL(url::kAboutBlankURL));
   EXPECT_NE(popup, tab);
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0),
-            pm->GetRenderFrameHostsForExtension(extension->id()).size());
-  EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
+  EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
+  EXPECT_EQ(1u, pm->GetAllFrames().size());
 
   // Create valid blob and filesystem URLs in the extension's origin.
   url::Origin extension_origin(extension_frame->GetLastCommittedOrigin());
   GURL blob_url(CreateBlobURL(extension_frame, "foo"));
   EXPECT_EQ(extension_origin, url::Origin(blob_url));
   GURL filesystem_url(CreateFileSystemURL(extension_frame, "foo"));
   EXPECT_EQ(extension_origin, url::Origin(filesystem_url));
 
   // Navigate the popup to each nested URL with extension origin.
   GURL nested_urls[] = {blob_url, filesystem_url};
   for (size_t i = 0; i < arraysize(nested_urls); i++) {
     content::TestNavigationObserver observer(popup);
     EXPECT_TRUE(ExecuteScript(
         popup, "location.href = '" + nested_urls[i].spec() + "';"));
     observer.Wait();
 
     // This is a top-level navigation that should be blocked since it
     // originates from a non-extension process.  Ensure that the error page
     // doesn't commit an extension URL or origin.
     EXPECT_NE(nested_urls[i], popup->GetLastCommittedURL());
     EXPECT_FALSE(extension_origin.IsSameOriginWith(
         popup->GetMainFrame()->GetLastCommittedOrigin()));
     EXPECT_NE("foo", GetTextContent(popup->GetMainFrame()));
 
-    EXPECT_EQ(IfExtensionsIsolated(1, 0),
-              pm->GetRenderFrameHostsForExtension(extension->id()).size());
-    EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
+    EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
+    EXPECT_EQ(1u, pm->GetAllFrames().size());
   }
 
   // Navigate second subframe to each nested URL from the main frame (i.e.,
-  // from non-extension process).  This should be blocked in
-  // --isolate-extensions, but allowed without --isolate-extensions due to
-  // unblessed extension frames.
+  // from non-extension process).  This should be blocked.
   //
   // TODO(alexmos): This is also temporarily allowed under PlzNavigate, because
   // currently this particular blocking happens in
   // ChromeContentBrowserClientExtensionsPart::ShouldAllowOpenURL, which isn't
   // triggered below under PlzNavigate (since there'll be no transfer).  Once
   // the blob/filesystem URL checks in ExtensionNavigationThrottle are updated
   // to apply to all frames and not just main frames, the PlzNavigate exception
   // below can be removed.  See https://crbug.com/661324.
   for (size_t i = 0; i < arraysize(nested_urls); i++) {
     EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame2", nested_urls[i]));
     content::RenderFrameHost* second_frame = ChildFrameAt(main_frame, 1);
-    if (IsIsolateExtensionsEnabled() &&
-        !content::IsBrowserSideNavigationEnabled()) {
+    if (!content::IsBrowserSideNavigationEnabled()) {
       EXPECT_NE(nested_urls[i], second_frame->GetLastCommittedURL());
       EXPECT_FALSE(extension_origin.IsSameOriginWith(
           second_frame->GetLastCommittedOrigin()));
       EXPECT_NE("foo", GetTextContent(second_frame));
-      EXPECT_EQ(IfExtensionsIsolated(1, 0),
+      EXPECT_EQ(1u,
                 pm->GetRenderFrameHostsForExtension(extension->id()).size());
-      EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size());
+      EXPECT_EQ(1u, pm->GetAllFrames().size());
     } else {
       EXPECT_EQ(nested_urls[i], second_frame->GetLastCommittedURL());
       EXPECT_EQ(extension_origin, second_frame->GetLastCommittedOrigin());
       EXPECT_EQ("foo", GetTextContent(second_frame));
-      EXPECT_EQ(IfExtensionsIsolated(2, 0),
+      EXPECT_EQ(2u,
                 pm->GetRenderFrameHostsForExtension(extension->id()).size());
-      EXPECT_EQ(IfExtensionsIsolated(2, 0), pm->GetAllFrames().size());
+      EXPECT_EQ(2u, pm->GetAllFrames().size());
     }
     EXPECT_TRUE(
         content::NavigateIframeToURL(tab, "frame2", GURL(url::kAboutBlankURL)));
   }
 }
 
 // Test that navigations to blob: and filesystem: URLs with extension origins
 // are allowed when initiated from extension processes.  See
 // https://crbug.com/645028 and https://crbug.com/644426.
 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest,
@@ skipping 270 matching lines @@
 
   // Verify that postMessage to window.opener works.
   VerifyPostMessageToOpener(popup->GetMainFrame(), main_frame);
 }
 
 // Verify that a web popup created via window.open from an extension subframe
 // can communicate with the extension page via window.opener.  Similar to the
 // test above, but for subframes.  See https://crbug.com/590068.
 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest,
                        WebPopupFromExtensionSubframeHasValidOpener) {
-  // This test only makes sense if OOPIFs are enabled for extension subframes.
-  if (!IsIsolateExtensionsEnabled())
-    return;
-
   // Create a simple extension without a background page.
   const Extension* extension = CreateExtension("Extension", false);
   embedded_test_server()->ServeFilesFromDirectory(extension->path());
   ASSERT_TRUE(embedded_test_server()->Start());
 
   // Navigate main tab to a web page with a blank iframe.  There should be no
   // extension frames yet.
   NavigateToURL(embedded_test_server()->GetURL("/blank_iframe.html"));
   ProcessManager* pm = ProcessManager::Get(profile());
   EXPECT_EQ(0u, pm->GetAllFrames().size());
@@ skipping 76 matching lines @@
   GURL b_url(embedded_test_server()->GetURL("b.com", "/empty.html"));
   EXPECT_TRUE(content::NavigateIframeToURL(tab, "frame0", b_url));
   {
     content::RenderFrameHost* subframe = ChildFrameAt(main_frame, 0);
     EXPECT_EQ(subframe->GetProcess(), main_frame->GetProcess());
     EXPECT_EQ(subframe->GetSiteInstance(), main_frame->GetSiteInstance());
   }
 }
 
 }  // namespace extensions