diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 15:31:03 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 15:31:03 +0000 |
| commit | c079356c84c9fbcc63d93830c0600047b53e5763 (patch) | |
| tree | 141a3bb1cb93159744ba92b62983a43946bda4bf /chrome/browser/extensions/extension_proxy_apitest.cc | |
| parent | e46a9e38c55c7544fa3974de39663a63d168eb43 (diff) | |
| download | chromium_src-c079356c84c9fbcc63d93830c0600047b53e5763.zip chromium_src-c079356c84c9fbcc63d93830c0600047b53e5763.tar.gz chromium_src-c079356c84c9fbcc63d93830c0600047b53e5763.tar.bz2 | |
Add ability to find out whether an extension pref value is coming from incognito preferences.
If the incognito flag in the request details is set, we now return an incognito parameter from experimental.preference.get that specifies whether the value is coming from the incognito preferences or the regular ones.
Also, return an error if an extension that isn't enabled in incognito mode is trying to access incognito preferences.
BUG=73994
TEST=ExtensionApiTest.*
Review URL: http://codereview.chromium.org/6628081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_proxy_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_proxy_apitest.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_proxy_apitest.cc b/chrome/browser/extensions/extension_proxy_apitest.cc index 970ca71..174be30 100644 --- a/chrome/browser/extensions/extension_proxy_apitest.cc +++ b/chrome/browser/extensions/extension_proxy_apitest.cc @@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyDirectSettings) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/direct")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/direct")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -87,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyAutoSettings) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/auto")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/auto")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -163,7 +163,7 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyFixedIndividual) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/individual")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -195,7 +195,8 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/individual_incognito_only")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual_incognito_only")) << + message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -220,7 +221,8 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/individual_incognito_also")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/individual_incognito_also")) << + message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); @@ -264,7 +266,7 @@ IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - ASSERT_TRUE(RunExtensionTest("proxy/bypass")) << message_; + ASSERT_TRUE(RunExtensionTestIncognito("proxy/bypass")) << message_; const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension); |