diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 18:24:57 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-12 18:24:57 +0000 |
| commit | cbf4d1916071d74b34b723629bdbefbcc1269b00 (patch) | |
| tree | f318ed779fa940aecb329cf51641de795229eede /chrome/test | |
| parent | 2b4f4598f46f7612014bd65e8f170407d88a71bc (diff) | |
| download | chromium_src-cbf4d1916071d74b34b723629bdbefbcc1269b00.zip chromium_src-cbf4d1916071d74b34b723629bdbefbcc1269b00.tar.gz chromium_src-cbf4d1916071d74b34b723629bdbefbcc1269b00.tar.bz2 | |
Reland r55750. Broke AppApiTest.*.
TBR=mpcomplete@chromium.org
BUG=49234
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
3 files changed, 36 insertions, 2 deletions
diff --git a/chrome/test/data/extensions/api_test/app_process/manifest.json b/chrome/test/data/extensions/api_test/app_process/manifest.json index 67b54e0..2e35457 100644 --- a/chrome/test/data/extensions/api_test/app_process/manifest.json +++ b/chrome/test/data/extensions/api_test/app_process/manifest.json @@ -2,8 +2,6 @@ "name": "app_process", "version": "0.1", "description": "Tests that app URLs are grouped into the right process", - "background_page": "test.html", - "permissions": ["tabs"], "app": { "urls": [ "http://localhost/files/extensions/api_test/app_process/path1", diff --git a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json new file mode 100644 index 0000000..8cca112 --- /dev/null +++ b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json @@ -0,0 +1,18 @@ +{ + "name": "test", + "version": "1", + "app": { + "urls": [ + "http://www.google.com/mail/", + "http://www.google.com/foobar/" + ], + "launch": { + "container": "window", + "web_url": "http://www.google.com/mail/" + } + }, + "permissions": [ + "notifications" + ], + "browser_action": {} +} diff --git a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json new file mode 100644 index 0000000..bad2e6c --- /dev/null +++ b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json @@ -0,0 +1,18 @@ +{ + "name": "test", + "version": "1", + "app": { + "urls": [ + "http://www.google.com/mail/", + "http://www.google.com/foobar/" + ], + "launch": { + "container": "window", + "web_url": "http://www.google.com/mail/" + } + }, + "permissions": [ + "notifications" + ], + "background_page": "foo.html" +} |