TEST: Removing PlatformAppsNotIsolated

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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 224 matching lines @@
                        "</body></html>",
                        name.c_str(), iframe_url.c_str(), iframe_url2.c_str()));
     dir->WriteManifest(manifest.ToJSON());
 
     const Extension* extension = LoadExtension(dir->UnpackedPath());
     EXPECT_TRUE(extension);
     temp_dirs_.push_back(dir.release());
     return extension;
   }
 
-  // Creates a V2 platform app that loads a web iframe in the app's sandbox
-  // page.
-  // TODO(lazyboy): Deprecate this behavior in https://crbug.com/615585.
+  // Creates a V2 platform app that tries to loads a web iframe in the app's
+  // sandbox page. Starting in version 57, Chrome will no longer allow external
+  // web content inside sandboxed pages. So the iframe is expected to be
+  // blocked.
   void CreateAppWithSandboxPage(const std::string& name) {
     std::unique_ptr<TestExtensionDir> dir(new TestExtensionDir);
 
     DictionaryBuilder manifest;
     manifest.Set("name", name)
         .Set("version", "1.0")
         .Set("manifest_version", 2)
         .Set("sandbox",
              DictionaryBuilder()
                  .Set("pages", ListBuilder().Append("sandbox.html").Build())
@@ skipping 675 matching lines @@
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.IsolateExtensionsProcessCountNoLimit"),
               HasOneSample(4));
   EXPECT_THAT(GetRenderProcessCount(), DependingOnPolicy(2, 4, 4));
   EXPECT_THAT(details->GetOutOfProcessIframeCount(),
               DependingOnPolicy(0, 2, 2));
 
   EXPECT_TRUE(IsInTrial("SiteIsolationExtensionsActive"));
 }
 
-// Due to http://crbug.com/612711, we are not isolating iframes from platform
-// apps with --isolate-extenions.
-IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, PlatformAppsNotIsolated) {
-  // --site-per-process will still isolate iframes from platform apps, so skip
-  // the test in that case.
-  if (content::AreAllSitesIsolatedForTesting())
-    return;
+// Creates a V2 platform app that tries to loads a web iframe in the app's
+// sandbox page. Starting in version 57, Chrome will no longer allow external
+// web content inside sandboxed pages. So the iframe is expected to be
+// blocked. If an error page is displayed, it shouldn't be loaded inside a
+// different process.
+IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest,
+                       PlatformAppsErrorPagesArentOOPIF) {
   CreateAppWithSandboxPage("Extension One");
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_EQ(0, details->GetOutOfProcessIframeCount());
 }
 
 // Exercises accounting in the case where an extension has two different-site
 // web iframes.
 IN_PROC_BROWSER_TEST_F(SiteDetailsBrowserTest, ExtensionWithTwoWebIframes) {
   scoped_refptr<TestMemoryDetails> details = new TestMemoryDetails();
@@ skipping 333 matching lines @@
   content::NavigateIframeToURL(
       tab, "child-1", extension2->GetResourceURL("/blank_iframe.html"));
   details = new TestMemoryDetails();
   details->StartFetchAndWait();
   EXPECT_THAT(details->uma()->GetAllSamples(
                   "SiteIsolation.SiteInstancesPerBrowsingInstance"),
               DependingOnPolicy(ElementsAre(Bucket(1, 2)),
                                 ElementsAre(Bucket(1, 1), Bucket(3, 1)),
                                 ElementsAre(Bucket(1, 1), Bucket(5, 1))));
 }