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 e7022f06e2cc2280670ba217982ce1157f3df1e4..5036ed37515ec92a02e712a47094b7343e976a33 100644 |
--- a/chrome/browser/extensions/process_manager_browsertest.cc |
+++ b/chrome/browser/extensions/process_manager_browsertest.cc |
@@ -852,37 +852,19 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, |
} |
// 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. |
- // |
- // 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. |
+ // from non-extension process). These should be canceled. |
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()) { |
nasko
2017/04/27 23:14:06
Nice to see this difference gone! Thanks!
|
- 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), |
- pm->GetRenderFrameHostsForExtension(extension->id()).size()); |
- EXPECT_EQ(IfExtensionsIsolated(1, 0), 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), |
- pm->GetRenderFrameHostsForExtension(extension->id()).size()); |
- EXPECT_EQ(IfExtensionsIsolated(2, 0), pm->GetAllFrames().size()); |
- } |
+ |
+ 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), |
+ pm->GetRenderFrameHostsForExtension(extension->id()).size()); |
+ EXPECT_EQ(IfExtensionsIsolated(1, 0), pm->GetAllFrames().size()); |
+ |
EXPECT_TRUE( |
content::NavigateIframeToURL(tab, "frame2", GURL(url::kAboutBlankURL))); |
} |