summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorcreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 01:40:40 +0000
committercreis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-07 01:40:40 +0000
commit311e4cc1f29a90bb5d9e36f7364d2e4fd1113fb7 (patch)
tree4e2ce7a7e975856c17ae50771f45977fbcc3ad3b /chrome/browser/extensions
parentf0dd202ffdb5779229f52c6cfda50853778d7287 (diff)
downloadchromium_src-311e4cc1f29a90bb5d9e36f7364d2e4fd1113fb7.zip
chromium_src-311e4cc1f29a90bb5d9e36f7364d2e4fd1113fb7.tar.gz
chromium_src-311e4cc1f29a90bb5d9e36f7364d2e4fd1113fb7.tar.bz2
Require experimental permission for isolated apps.
BUG=84740 TEST=IsolatedAppApiTest.CookieIsolation TEST=ExtensionManifestTest.IsolatedApps Review URL: http://codereview.chromium.org/7058029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/isolated_app_apitest.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/extensions/isolated_app_apitest.cc b/chrome/browser/extensions/isolated_app_apitest.cc
index ed69e42..aa4b12d 100644
--- a/chrome/browser/extensions/isolated_app_apitest.cc
+++ b/chrome/browser/extensions/isolated_app_apitest.cc
@@ -48,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, CookieIsolation) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableExperimentalAppManifests);
+ switches::kEnableExperimentalExtensionApis);
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -105,18 +105,14 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, CookieIsolation) {
ASSERT_FALSE(HasCookie(tab3, "nonAppFrame"));
}
-// Without the --enable-experimental-app-manifests flag, all the tabs
-// should see each others' cookies.
-IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, CookieIsolationRequiresFlag) {
+// Ensure that cookies are not isolated if the isolated apps are not installed.
+IN_PROC_BROWSER_TEST_F(IsolatedAppApiTest, NoCookieIsolationWithoutApp) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisablePopupBlocking);
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
- ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
- ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
-
// The app under test acts on URLs whose host is "localhost",
// so the URLs we navigate to must have host "localhost".
GURL base_url = test_server()->GetURL(