diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 19:42:55 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-29 19:42:55 +0000 |
| commit | a2a098d74dafdf3c2e71fd0f63c86a88e204eaf6 (patch) | |
| tree | d2039a49a6fe92d953a61daa4671e36f846670f1 /chrome/test | |
| parent | 99b7c57fda118a1507d30b59e29005fdd2a73f7c (diff) | |
| download | chromium_src-a2a098d74dafdf3c2e71fd0f63c86a88e204eaf6.zip chromium_src-a2a098d74dafdf3c2e71fd0f63c86a88e204eaf6.tar.gz chromium_src-a2a098d74dafdf3c2e71fd0f63c86a88e204eaf6.tar.bz2 | |
fix host permission handling when sites add support for https for the same set of hosts. this shouldn't be treated as a privilege increase, but is.
Also, centralize the logic for permission messages in preparation for splitting this out of Extension altogether.
BUG=56794
TEST=ExtensionTest.IsPrivilegeIncrease
Review URL: http://codereview.chromium.org/3501013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rwxr-xr-x | chrome/test/data/extensions/allow_silent_upgrade/hosts5_new.json | 23 | ||||
| -rwxr-xr-x | chrome/test/data/extensions/allow_silent_upgrade/hosts5_old.json | 19 |
2 files changed, 42 insertions, 0 deletions
diff --git a/chrome/test/data/extensions/allow_silent_upgrade/hosts5_new.json b/chrome/test/data/extensions/allow_silent_upgrade/hosts5_new.json new file mode 100755 index 0000000..96fecab --- /dev/null +++ b/chrome/test/data/extensions/allow_silent_upgrade/hosts5_new.json @@ -0,0 +1,23 @@ +{ + "name": "allow silent update", + "version": "1.0", + "permissions": [ + "tabs", + "notifications", + "https://*.example.com/", + "http://*.example.com/" + ], + "content_scripts": [ + { + "matches": [ + "http://*.example.com/*", + "https://*.example.com/*", + "http://*.example.co.uk/*", + "https://*.example.co.uk/*", + "http://*.example.com.au/*", + "https://*.example.com.au/*" + ], + "js": ["404.js"] + } + ] +} diff --git a/chrome/test/data/extensions/allow_silent_upgrade/hosts5_old.json b/chrome/test/data/extensions/allow_silent_upgrade/hosts5_old.json new file mode 100755 index 0000000..51f99c0 --- /dev/null +++ b/chrome/test/data/extensions/allow_silent_upgrade/hosts5_old.json @@ -0,0 +1,19 @@ +{ + "name": "allow silent update", + "version": "1.0", + "permissions": [ + "tabs", + "notifications", + "http://*.example.com/" + ], + "content_scripts": [ + { + "matches": [ + "http://*.example.com/*", + "http://*.example.co.uk/*", + "http://*.example.com.au/*" + ], + "js": ["404.js"] + } + ] +} |