Some app-related manifest cleanup:

1) Group app-related keys under a new "app" key, and change
   the implementation of IsApp() to just check that.

2) Rename IsApp() and IsTheme() -> is_app(), is_theme() to
   match style guide.

3) Remove web_content.enabled. That was a stupid idea.

4) Make some kind of launch URL required for apps.

BUG=46632

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50278 0039d316-1c4b-4281-b951-d872f2087c98

33 files changed, 177 insertions, 107 deletions

diff --git a/chrome/test/data/extensions/app1.crx b/chrome/test/data/extensions/app1.crx
deleted file mode 100644
index df016a9..0000000
--- a/chrome/test/data/extensions/app1.crx
+++ /dev/null
diff --git a/chrome/test/data/extensions/app1/manifest.json b/chrome/test/data/extensions/app1/manifest.json
new file mode 100644
index 0000000..9692490
--- /dev/null
+++ b/chrome/test/data/extensions/app1/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "Test App 1",
+  "version": "1",
+  "app": {
+    "web_content": {
+      "origin": "http://www.example.com/",
+      "paths": ["path1", "path2"]
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
+  }
+}
diff --git a/chrome/test/data/extensions/app2.crx b/chrome/test/data/extensions/app2.crx
deleted file mode 100644
index 5dd5ea7..0000000
--- a/chrome/test/data/extensions/app2.crx
+++ /dev/null
diff --git a/chrome/test/data/extensions/app2/manifest.json b/chrome/test/data/extensions/app2/manifest.json
new file mode 100644
index 0000000..b32b5c2
--- /dev/null
+++ b/chrome/test/data/extensions/app2/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "Test App 2",
+  "version": "1",
+  "app": {
+    "web_content": {
+      "origin": "http://www.example.com/",
+      "paths": ["path3", "path4"]
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
+  }
+}
diff --git a/chrome/test/data/extensions/app3.crx b/chrome/test/data/extensions/app3.crx
deleted file mode 100644
index e840374..0000000
--- a/chrome/test/data/extensions/app3.crx
+++ /dev/null
diff --git a/chrome/test/data/extensions/app3/manifest.json b/chrome/test/data/extensions/app3/manifest.json
new file mode 100644
index 0000000..08c616d
--- /dev/null
+++ b/chrome/test/data/extensions/app3/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "Test App 3",
+  "version": "1",
+  "app": {
+    "web_content": {
+      "origin": "http://www.example.com/",
+      "paths": ["path1/should_overlap", "path5"]
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
+  }
+}
diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type.json b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type.json
index 3aa5a52..009ed45 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": 42,
-    "local_path": "hot.html"
+  "app": {
+    "launch": {
+      "container": 42,
+      "local_path": "hot.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_value.json b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_value.json
index f1b2ed6..89b5fcd 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_value.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_container_invalid_value.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "foobar",
-    "local_path": "dog.html"
+  "app": {
+    "launch": {
+      "container": "foobar",
+      "local_path": "dog.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_container_without_launch_url.json b/chrome/test/data/extensions/manifest_tests/launch_container_without_launch_url.json
index 66ea2e5..34da266 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_container_without_launch_url.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_container_without_launch_url.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "tab"
+  "app": {
+    "launch": {
+      "container": "tab"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_fullscreen.json b/chrome/test/data/extensions/manifest_tests/launch_fullscreen.json
index f2bb685..9137105 100755
--- a/chrome/test/data/extensions/manifest_tests/launch_fullscreen.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_fullscreen.json
@@ -1,9 +1,11 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "window",
-    "fullscreen": true,
-    "local_path": "bar.html"
+  "app": {
+    "launch": {
+      "container": "window",
+      "fullscreen": true,
+      "local_path": "bar.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_fullscreen_invalid.json b/chrome/test/data/extensions/manifest_tests/launch_fullscreen_invalid.json
index 01100ff..21cdfc9 100755
--- a/chrome/test/data/extensions/manifest_tests/launch_fullscreen_invalid.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_fullscreen_invalid.json
@@ -1,9 +1,11 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "window",
-    "fullscreen": "true",
-    "local_path": "bar.html"
+  "app": {
+    "launch": {
+      "container": "window",
+      "fullscreen": "true",
+      "local_path": "bar.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_local_path.json b/chrome/test/data/extensions/manifest_tests/launch_local_path.json
index 72dd2e0..79ec3f4 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_local_path.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_local_path.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "local_path": "launch.html"
+  "app": {
+    "launch": {
+      "local_path": "launch.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_panel.json b/chrome/test/data/extensions/manifest_tests/launch_panel.json
index 381cf35..d7186ad 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_panel.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_panel.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "panel",
-    "web_url": "http://www.google.com/hot.html"
+  "app": {
+    "launch": {
+      "container": "panel",
+      "web_url": "http://www.google.com/hot.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_path_and_url.json b/chrome/test/data/extensions/manifest_tests/launch_path_and_url.json
index 93cb1bc..0162f8c 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_path_and_url.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_path_and_url.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "local_path": "foo",
-    "web_url": "http://www.google.com/"
+  "app": {
+    "launch": {
+      "local_path": "foo",
+       "web_url": "http://www.google.com/"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_type.json b/chrome/test/data/extensions/manifest_tests/launch_path_invalid_type.json
index 583c61b..5d52292 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_type.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_path_invalid_type.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "local_path": 42
+  "app": {
+    "launch": {
+      "local_path": 42
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_value.json b/chrome/test/data/extensions/manifest_tests/launch_path_invalid_value.json
index fd95800..802efd1 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_value.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_path_invalid_value.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "local_path": "http://www.google.com/"
+  "app": {
+    "launch": {
+      "local_path": "http://www.google.com/"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_tab.json b/chrome/test/data/extensions/manifest_tests/launch_tab.json
index 650dd95..60f6c45 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_tab.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_tab.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "tab",
-    "local_path": "foo.html"
+  "app": {
+    "launch": {
+      "container": "tab",
+      "local_path": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_url_invalid_type.json b/chrome/test/data/extensions/manifest_tests/launch_url_invalid_type.json
index e6fa384..17a7d88 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_url_invalid_type.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_url_invalid_type.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "web_url": 42
+  "app": {
+    "launch": {
+      "web_url": 42
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_web_url_absolute.json b/chrome/test/data/extensions/manifest_tests/launch_web_url_absolute.json
index b3e4270..669fe2f 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_web_url_absolute.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_web_url_absolute.json
@@ -1,7 +1,9 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "web_url": "http://www.google.com/launch.html"
+  "app": {
+    "launch": {
+      "web_url": "http://www.google.com/launch.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_web_url_relative.json b/chrome/test/data/extensions/manifest_tests/launch_web_url_relative.json
index f62dad9..1652c36 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_web_url_relative.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_web_url_relative.json
@@ -1,11 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "http://www.google.com/"
-  },
-  "launch": {
-    "web_url": "launch.html"
+  "app": {
+    "web_content": {
+      "origin": "http://www.google.com/"
+    },
+    "launch": {
+      "web_url": "launch.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/launch_window.json b/chrome/test/data/extensions/manifest_tests/launch_window.json
index d73a9bf..fe1ea13 100644
--- a/chrome/test/data/extensions/manifest_tests/launch_window.json
+++ b/chrome/test/data/extensions/manifest_tests/launch_window.json
@@ -1,8 +1,10 @@
 {
   "name": "test",
   "version": "1",
-  "launch": {
-    "container": "window",
-    "local_path": "bar.html"
+  "app": {
+    "launch": {
+      "container": "window",
+      "local_path": "bar.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/valid_app.json b/chrome/test/data/extensions/manifest_tests/valid_app.json
index 734cffb..db53b3b 100644
--- a/chrome/test/data/extensions/manifest_tests/valid_app.json
+++ b/chrome/test/data/extensions/manifest_tests/valid_app.json
@@ -1,17 +1,18 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "http://www.google.com/",
-    "paths": [
-      "mail/",
-      "foobar/"
-    ]
-  },
-  "launch": {
-    "container": "window",
-    "web_url": "mail/"
+  "app": {
+    "web_content": {
+      "origin": "http://www.google.com/",
+      "paths": [
+        "mail/",
+        "foobar/"
+      ]
+    },
+    "launch": {
+      "container": "window",
+      "web_url": "mail/"
+    }
   },
   "permissions": [
     "notifications"
diff --git a/chrome/test/data/extensions/manifest_tests/web_content_disabled.json b/chrome/test/data/extensions/manifest_tests/web_content_disabled.json
deleted file mode 100644
index a355142..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_content_disabled.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": false
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/web_content_enabled_invalid.json b/chrome/test/data/extensions/manifest_tests/web_content_enabled_invalid.json
deleted file mode 100644
index 2411c2d..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_content_enabled_invalid.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": 42
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/web_content_not_enabled.json b/chrome/test/data/extensions/manifest_tests/web_content_not_enabled.json
deleted file mode 100644
index 28f6469a..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_content_not_enabled.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_1.json b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_1.json
index 69ad622..171745a 100644
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_1.json
+++ b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_1.json
@@ -1,8 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "wiggity"
+  "app": {
+    "web_content": {
+      "origin": "wiggity"
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_2.json b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_2.json
index 801b0b9..e8ec0ef 100644
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_2.json
+++ b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_2.json
@@ -1,8 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "ftp://www.google.com/"
+  "app": {
+    "web_content": {
+      "origin": "ftp://www.google.com/"
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_3.json b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_3.json
index c6c3672..af93225 100644
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_3.json
+++ b/chrome/test/data/extensions/manifest_tests/web_origin_invalid_3.json
@@ -1,8 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "https://www.google.com/monkey"
+  "app": {
+    "web_content": {
+      "origin": "https://www.google.com/monkey"
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_origin_web_content_disabled.json b/chrome/test/data/extensions/manifest_tests/web_origin_web_content_disabled.json
deleted file mode 100644
index 5389879..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_origin_web_content_disabled.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "origin": "http://www.google.com/"
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/web_origin_wrong_type.json b/chrome/test/data/extensions/manifest_tests/web_origin_wrong_type.json
index 42a2ae3..930038b 100644
--- a/chrome/test/data/extensions/manifest_tests/web_origin_wrong_type.json
+++ b/chrome/test/data/extensions/manifest_tests/web_origin_wrong_type.json
@@ -1,8 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": 42
+  "app": {
+    "web_content": {
+      "origin": 42
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_1.json b/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_1.json
index f259790..f29782e 100644
--- a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_1.json
+++ b/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_1.json
@@ -1,10 +1,14 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": [
-      42
-    ]
+  "app": {
+    "web_content": {
+      "paths": [
+        42
+      ]
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_2.json b/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_2.json
index d435ee4..faa9460 100644
--- a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_2.json
+++ b/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_2.json
@@ -1,10 +1,14 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": [
-      "http://www.google.com/monkey"
-    ]
+  "app": {
+    "web_content": {
+      "paths": [
+        "http://www.google.com/monkey"
+      ]
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }
diff --git a/chrome/test/data/extensions/manifest_tests/web_paths_wrong_type.json b/chrome/test/data/extensions/manifest_tests/web_paths_wrong_type.json
index 56e0b28..356e6a2 100644
--- a/chrome/test/data/extensions/manifest_tests/web_paths_wrong_type.json
+++ b/chrome/test/data/extensions/manifest_tests/web_paths_wrong_type.json
@@ -1,8 +1,12 @@
 {
   "name": "test",
   "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": 42
+  "app": {
+    "web_content": {
+      "paths": 42
+    },
+    "launch": {
+      "web_url": "foo.html"
+    }
   }
 }