diff options
author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-07-14 15:13:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 22:15:40 +0000 |
commit | 4de4469901fb86a3818c06deb035b9c0db2ddff0 (patch) | |
tree | e73b0dfb36ba541a3b62e59f86cce6f0966d223d /extensions/browser/guest_view/web_view | |
parent | 7ca3b9796a6812c3baa0b7d843d544a5795ff4df (diff) | |
download | chromium_src-4de4469901fb86a3818c06deb035b9c0db2ddff0.zip chromium_src-4de4469901fb86a3818c06deb035b9c0db2ddff0.tar.gz chromium_src-4de4469901fb86a3818c06deb035b9c0db2ddff0.tar.bz2 |
[Extensions OOPI] Update ExtensionApiTest.ContentScriptExtensionIframe
ContentScriptExtensionIframe tests that certain apis are not available to an
extension context if it's an untrusted process - such as an extension page in
an iframe of a web page. But with OOPI, this becomes an extension process
(woohoo!). Update the test to handle OOPI logic.
BUG=455776
Review URL: https://codereview.chromium.org/1237683003
Cr-Commit-Position: refs/heads/master@{#338743}
Diffstat (limited to 'extensions/browser/guest_view/web_view')
-rw-r--r-- | extensions/browser/guest_view/web_view/web_view_apitest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index 061ec3d5..46744af 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -46,6 +46,7 @@ const char kUserAgentRedirectResponsePath[] = "/detect-user-agent"; const char kTestDataDirectory[] = "testDataDirectory"; const char kTestServerPort[] = "testServer.port"; const char kTestWebSocketPort[] = "testWebSocketPort"; +const char kSitePerProcess[] = "sitePerProcess"; class EmptyHttpResponse : public net::test_server::HttpResponse { public: @@ -189,6 +190,9 @@ void WebViewAPITest::SetUpOnMainThread() { TestGetConfigFunction::set_test_config_state(&test_config_); base::FilePath test_data_dir; test_config_.SetInteger(kTestWebSocketPort, 0); + test_config_.SetBoolean(kSitePerProcess, + base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSitePerProcess)); } void WebViewAPITest::StartTestServer() { |