Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: content/browser/frame_host/frame_tree_browsertest.cc

Issue 2827803002: Make Interaction Media Features MQ dynamic on Linux. (Closed)
Patch Set: Rebase and fix test failures Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/frame_tree_browsertest.cc
diff --git a/content/browser/frame_host/frame_tree_browsertest.cc b/content/browser/frame_host/frame_tree_browsertest.cc
index b19fcbe141458ebf88efd5dc1c93135035a34973..aa5022899b9862994e0de67d7cbe0bedcdac34c3 100644
--- a/content/browser/frame_host/frame_tree_browsertest.cc
+++ b/content/browser/frame_host/frame_tree_browsertest.cc
@@ -708,6 +708,10 @@ class IsolateIcelandFrameTreeBrowserTest : public ContentBrowserTest {
IsolateIcelandFrameTreeBrowserTest() {}
void SetUpCommandLine(base::CommandLine* command_line) override {
+ // blink suppresses navigations to blob URLs of origins different from the
+ // frame initiating the navigation. We disable those checks for this test, to
sadrul 2017/05/10 01:47:53 git cl format
+ // test what happens in a compromise scenario.
+ command_line->AppendSwitch(switches::kDisableWebSecurity);
command_line->AppendSwitchASCII(switches::kIsolateSitesForTesting, "*.is");
}
@@ -724,12 +728,6 @@ class IsolateIcelandFrameTreeBrowserTest : public ContentBrowserTest {
// Regression test for https://crbug.com/644966
IN_PROC_BROWSER_TEST_F(IsolateIcelandFrameTreeBrowserTest,
ProcessSwitchForIsolatedBlob) {
- // blink suppresses navigations to blob URLs of origins different from the
- // frame initiating the navigation. We disable those checks for this test, to
- // test what happens in a compromise scenario.
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableWebSecurity);
-
// Set up an iframe.
WebContents* contents = shell()->web_contents();
FrameTreeNode* root =

Powered by Google App Engine
This is Rietveld 408576698