Require that platform apps use manifest_version 2.

R=asargent@chromium.org Review URL: http://codereview.chromium.org/10012028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131217 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Apr 7, 2012 · 7bfc592 · 7bfc592
1 parent 68dcb1f
commit 7bfc592
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 1 deletion.
diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json
@@ -124,7 +124,8 @@
     ]
   },
   "platform_app": {
-    "extension_types": ["platform_app"]
+    "extension_types": ["platform_app"],
+    "min_manifest_version": 2
   },
   "plugins": {
     "extension_types": ["extension", "packaged_app", "hosted_app"]

diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
@@ -297,6 +297,11 @@ TEST_F(ExtensionManifestTest, PlatformApps) {
   CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps);
 
   LoadAndExpectSuccess("init_valid_platform_app.json");
+
+  LoadAndExpectError(
+      "init_invalid_platform_app_3.json",
+      "Feature 'platform_app' is not accessible. "
+          "Requires manifest version of at least 2.");
 }
 
 TEST_F(ExtensionManifestTest, CertainApisRequirePlatformApps) {

diff --git a/chrome/test/data/extensions/manifest_tests/init_invalid_platform_app_3.json b/chrome/test/data/extensions/manifest_tests/init_invalid_platform_app_3.json
@@ -0,0 +1,6 @@
+{
+  "name": "Platform Test",
+  "platform_app": true,
+  "version": "1"
+  // "manifest_version": 2 is required
+}
diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_size_constraints.json b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_size_constraints.json
@@ -2,6 +2,7 @@
   "name": "test",
   "version": "1",
   "platform_app": true,
+  "manifest_version": 2,
   "app": {
     "launch": {
       "container": "shell",

diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type_for_platform.json b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type_for_platform.json
@@ -2,6 +2,7 @@
   "name": "interesting app",
   "version": "1",
   "platform_app": true,
+  "manifest_version": 2,
   "app": {
     "launch": {
       "container": "tab",

diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_missing_size_for_platform.json b/chrome/test/data/extensions/manifest_tests/launch_container_missing_size_for_platform.json
@@ -2,6 +2,7 @@
   "name": "test",
   "version": "1",
   "platform_app": true,
+  "manifest_version": 2,
   "app": {
     "launch": {
       "container": "shell",