From 953620b6b138131552b29163a6a3fa4b3593f083 Mon Sep 17 00:00:00 2001
From: "jstritar@chromium.org"
 <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sun, 4 Dec 2011 00:55:32 +0000
Subject: Reland restrict extension features based on the extension type.

The "chrome_url_overrides" manifest key is now accessible by packaged apps.

BUG=101992, 104103
TEST=existing, ManifestTest

Review URL: http://codereview.chromium.org/8654001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112914 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../manifest_tests/background_permission.json           | 17 +++++++++++++++++
 .../extensions/manifest_tests/disallow_hybrid_1.json    | 17 -----------------
 .../extensions/manifest_tests/disallow_hybrid_2.json    | 17 -----------------
 .../extensions/manifest_tests/multiple_ui_surfaces.json |  6 ++++++
 .../manifest_tests/multiple_ui_surfaces_1.json          |  6 ------
 .../manifest_tests/multiple_ui_surfaces_2.json          | 10 ----------
 .../manifest_tests/multiple_ui_surfaces_3.json          | 11 -----------
 7 files changed, 23 insertions(+), 61 deletions(-)
 create mode 100644 chrome/test/data/extensions/manifest_tests/background_permission.json
 delete mode 100644 chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json
 delete mode 100644 chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json
 create mode 100644 chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json
 delete mode 100644 chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json
 delete mode 100644 chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json
 delete mode 100644 chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json

(limited to 'chrome/test')

diff --git a/chrome/test/data/extensions/manifest_tests/background_permission.json b/chrome/test/data/extensions/manifest_tests/background_permission.json
new file mode 100644
index 0000000..06be2c3
--- /dev/null
+++ b/chrome/test/data/extensions/manifest_tests/background_permission.json
@@ -0,0 +1,17 @@
+{
+  "name": "test",
+  "version": "1",
+  "app": {
+    "urls": [
+      "http://www.google.com/mail/",
+      "http://www.google.com/foobar/"
+    ],
+    "launch": {
+      "web_url": "http://www.google.com/mail/"
+    }
+  },
+  "permissions": [
+    "notifications"
+  ],
+  "background_page": "foo.html"
+}
diff --git a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json b/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json
deleted file mode 100644
index 3ec899f..0000000
--- a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "app": {
-    "urls": [
-      "http://www.google.com/mail/",
-      "http://www.google.com/foobar/"
-    ],
-    "launch": {
-      "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
deleted file mode 100644
index 06be2c3..0000000
--- a/chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "app": {
-    "urls": [
-      "http://www.google.com/mail/",
-      "http://www.google.com/foobar/"
-    ],
-    "launch": {
-      "web_url": "http://www.google.com/mail/"
-    }
-  },
-  "permissions": [
-    "notifications"
-  ],
-  "background_page": "foo.html"
-}
diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json
new file mode 100644
index 0000000..ecc86eb
--- /dev/null
+++ b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces.json
@@ -0,0 +1,6 @@
+{
+  "name": "foo",
+  "version": "1",
+  "browser_action": {},
+  "page_action": {}
+}
diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json
deleted file mode 100644
index ecc86eb..0000000
--- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_1.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "foo",
-  "version": "1",
-  "browser_action": {},
-  "page_action": {}
-}
diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json
deleted file mode 100644
index 13c798b..0000000
--- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "foo",
-  "version": "1",
-  "browser_action": {},
-  "app": {
-    "launch": {
-      "local_path": "foo.html"
-    }
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json b/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json
deleted file mode 100644
index 2317026..0000000
--- a/chrome/test/data/extensions/manifest_tests/multiple_ui_surfaces_3.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "foo",
-  "version": "1",
-  "browser_action": {},
-  "page_action": {},
-  "app": {
-    "launch": {
-      "local_path": "foo.html"
-    }
-  }
-}
-- 
cgit v1.1