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

Side by Side Diff: extensions/browser/guest_view/web_view/web_view_apitest.cc

Issue 2456413002: Revert of Enable Site Isolation for Extensions. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « chrome/common/extensions/extension_process_policy.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/guest_view/web_view/web_view_apitest.h" 5 #include "extensions/browser/guest_view/web_view/web_view_apitest.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 AppShellTest::SetUpCommandLine(command_line); 186 AppShellTest::SetUpCommandLine(command_line);
187 command_line->AppendSwitchASCII(::switches::kJavaScriptFlags, "--expose-gc"); 187 command_line->AppendSwitchASCII(::switches::kJavaScriptFlags, "--expose-gc");
188 } 188 }
189 189
190 void WebViewAPITest::SetUpOnMainThread() { 190 void WebViewAPITest::SetUpOnMainThread() {
191 AppShellTest::SetUpOnMainThread(); 191 AppShellTest::SetUpOnMainThread();
192 192
193 TestGetConfigFunction::set_test_config_state(&test_config_); 193 TestGetConfigFunction::set_test_config_state(&test_config_);
194 base::FilePath test_data_dir; 194 base::FilePath test_data_dir;
195 test_config_.SetInteger(kTestWebSocketPort, 0); 195 test_config_.SetInteger(kTestWebSocketPort, 0);
196 bool isolate_extensions = true; 196 bool isolate_extensions = base::CommandLine::ForCurrentProcess()->HasSwitch(
197 ::switches::kSitePerProcess) ||
198 base::CommandLine::ForCurrentProcess()->HasSwitch(
199 extensions::switches::kIsolateExtensions);
197 test_config_.SetBoolean(kIsolateExtensions, isolate_extensions); 200 test_config_.SetBoolean(kIsolateExtensions, isolate_extensions);
198 } 201 }
199 202
200 void WebViewAPITest::StartTestServer() { 203 void WebViewAPITest::StartTestServer() {
201 // For serving guest pages. 204 // For serving guest pages.
202 if (!embedded_test_server()->Start()) { 205 if (!embedded_test_server()->Start()) {
203 LOG(ERROR) << "Failed to start test server."; 206 LOG(ERROR) << "Failed to start test server.";
204 return; 207 return;
205 } 208 }
206 209
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 // This test verifies that webview.contentWindow works inside an iframe 734 // This test verifies that webview.contentWindow works inside an iframe
732 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebViewInsideFrame) { 735 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebViewInsideFrame) {
733 LaunchApp("web_view/inside_iframe"); 736 LaunchApp("web_view/inside_iframe");
734 } 737 }
735 738
736 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestCaptureVisibleRegion) { 739 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestCaptureVisibleRegion) {
737 RunTest("testCaptureVisibleRegion", "web_view/apitest"); 740 RunTest("testCaptureVisibleRegion", "web_view/apitest");
738 } 741 }
739 742
740 } // namespace extensions 743 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/extension_process_policy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698