Revert 42091 - Refactor apprelated manifest properties so that they don't

include the name 'app'. I think these will be useful for normal
extensions, too.

Also extract an ExtensionExtent class out of Extension. I think
this will be useful for passing by value to the IO thread.

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

TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/1120005

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

26 files changed, 0 insertions, 211 deletions

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
deleted file mode 100644
index 3aa5a52..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index f1b2ed6..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_container_invalid_value.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 66ea2e5..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_container_without_launch_url.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "launch": {
-    "container": "tab"
-  }
-}
diff --git a/chrome/test/data/extensions/manifest_tests/launch_default.json b/chrome/test/data/extensions/manifest_tests/launch_default.json
deleted file mode 100644
index 0d9792a..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_default.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "test",
-  "version": "1"
-}
diff --git a/chrome/test/data/extensions/manifest_tests/launch_local_path.json b/chrome/test/data/extensions/manifest_tests/launch_local_path.json
deleted file mode 100644
index 72dd2e0..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_local_path.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 381cf35..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_panel.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 93cb1bc..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_path_and_url.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 583c61b..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_type.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index fd95800..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_path_invalid_value.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 650dd95..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_tab.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index e6fa384..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_url_invalid_type.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index b3e4270..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_web_url_absolute.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index f62dad9..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_web_url_relative.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "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
deleted file mode 100644
index d73a9bf..0000000
--- a/chrome/test/data/extensions/manifest_tests/launch_window.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "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
deleted file mode 100644
index 734cffb..0000000
--- a/chrome/test/data/extensions/manifest_tests/valid_app.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "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
deleted file mode 100644
index 69ad622..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "wiggity"
-  }
-}
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
deleted file mode 100644
index 801b0b9..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "ftp://www.google.com/"
-  }
-}
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
deleted file mode 100644
index c6c3672..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_origin_invalid_3.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": "https://www.google.com/monkey"
-  }
-}
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
deleted file mode 100644
index 42a2ae3..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_origin_wrong_type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "origin": 42
-  }
-}
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
deleted file mode 100644
index f259790..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": [
-      42
-    ]
-  }
-}
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
deleted file mode 100644
index d435ee4..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_paths_invalid_path_2.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": [
-      "http://www.google.com/monkey"
-    ]
-  }
-}
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
deleted file mode 100644
index 56e0b28..0000000
--- a/chrome/test/data/extensions/manifest_tests/web_paths_wrong_type.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "test",
-  "version": "1",
-  "web_content": {
-    "enabled": true,
-    "paths": 42
-  }
-}