Remove deprecated page action features from manifest v2.

BUG=106977

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

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

11 files changed, 57 insertions, 31 deletions

diff --git a/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
index 249bd31..6c72735 100644
--- a/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
@@ -4,8 +4,8 @@
   "manifest_version": 2,
   "description": "apitest for popups",
   "browser_action": {
-      "name": "grow",
-      "icons": ["chromium.png"],
-      "popup": "popup.html"
+      "default_title": "grow",
+      "default_icon": "chromium.png",
+      "default_popup": "popup.html"
   }
 }
diff --git a/chrome/test/data/extensions/api_test/incognito/popup/manifest.json b/chrome/test/data/extensions/api_test/incognito/popup/manifest.json
index 72354d4..6586383 100644
--- a/chrome/test/data/extensions/api_test/incognito/popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/incognito/popup/manifest.json
@@ -5,6 +5,6 @@
   "description": "apitest for popups in incognito mode",
   "permissions": [ "tabs" ],
   "browser_action": {
-    "popup": "popup.html"
+    "default_popup": "popup.html"
   }
 }
diff --git a/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json b/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json
index 7c0ed90..2b28415 100644
--- a/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json
+++ b/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json
@@ -1,7 +1,6 @@
 {
   "name": "Test of old-style page actions API",
   "version": "1.0",
-  "manifest_version": 2,
   "background": {
     "page": "background.html"
   },
diff --git a/chrome/test/data/extensions/api_test/page_action/popup/manifest.json b/chrome/test/data/extensions/api_test/page_action/popup/manifest.json
index 0a1d404..cef0e49 100644
--- a/chrome/test/data/extensions/api_test/page_action/popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/page_action/popup/manifest.json
@@ -11,6 +11,6 @@
   "page_action": {
       "default_title": "Popup hello world",
       "default_icon": "icon.png",
-      "popup": "popup.html"
+      "default_popup": "popup.html"
   }
 }
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json
index 265bbd8..3f66acb 100644
--- a/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json
+++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtA/manifest.json
@@ -1,13 +1,12 @@
 {
-    "name": "Popup Test",
-    "version": "1.0",
-  "manifest_version": 2,
-    "page_action": {
-        "default_icon": "icon.png",
-        "popup": "popup.html"
-    },
-    "background": {
-      "page": "background.html"
-    },
-    "permissions": [ "tabs", "http://*/*" ]
+  "name": "Popup Test",
+  "version": "1.0",
+  "page_action": {
+    "default_icon": "icon.png",
+    "default_popup": "popup.html"
+  },
+  "background": {
+    "page": "background.html"
+  },
+  "permissions": [ "tabs", "http://*/*" ]
 }
diff --git a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json
index 6474ae9..7c5b251 100644
--- a/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json
+++ b/chrome/test/data/extensions/browsertest/crash_44415/ExtB/manifest.json
@@ -1,13 +1,13 @@
 {
-    "name": "Popup Test2",
-    "version": "1.0",
-    "manifest_version": 2,
-    "page_action": {
-        "default_icon": "icon.png",
-        "popup": "popup.html"
-    },
-    "background": {
-      "page": "background.html"
-    },
-    "permissions": [ "tabs", "http://*/*" ]
+  "name": "Popup Test2",
+  "version": "1.0",
+  "manifest_version": 2,
+  "page_action": {
+    "default_icon": "icon.png",
+    "default_popup": "popup.html"
+  },
+  "background": {
+    "page": "background.html"
+  },
+  "permissions": [ "tabs", "http://*/*" ]
 }
diff --git a/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2.json b/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2.json
new file mode 100644
index 0000000..2c798db
--- /dev/null
+++ b/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2.json
@@ -0,0 +1,18 @@
+{
+  "manifest_version": 2,
+  "name": "my extension",
+  "version": "1.0.0.0",
+  "description": "All these page action sub-features are removed in manifest version 2",
+  "page_action": {
+    "id": "id",
+    "icons": [
+      "pageAction.png"
+    ],
+    "name": "name",
+    "popup": "popup.html"
+  },
+  "page_actions": [
+    {
+    }
+  ]
+}
diff --git a/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2b.json b/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2b.json
new file mode 100644
index 0000000..3933dfc
--- /dev/null
+++ b/chrome/test/data/extensions/manifest_tests/page_action_manifest_version_2b.json
@@ -0,0 +1,10 @@
+{
+  "manifest_version": 2,
+  "name": "my extension",
+  "version": "1.0.0.0",
+  "description": "The page_action.popup value cannot be an object in manifest_version 2.",
+  "page_action": {
+    "default_popup": {
+    }
+  }
+}
diff --git a/chrome/test/data/extensions/trigger_actions/browser_action_popup/manifest.json b/chrome/test/data/extensions/trigger_actions/browser_action_popup/manifest.json
index 948870a..87ad366 100644
--- a/chrome/test/data/extensions/trigger_actions/browser_action_popup/manifest.json
+++ b/chrome/test/data/extensions/trigger_actions/browser_action_popup/manifest.json
@@ -7,6 +7,6 @@
   ],
   "browser_action": {
       "default_icon": "icon.png",
-      "popup": "popup.html"
+      "default_popup": "popup.html"
   }
 }
diff --git a/chrome/test/data/extensions/trigger_actions/page_action_popup/manifest.json b/chrome/test/data/extensions/trigger_actions/page_action_popup/manifest.json
index 571809f..54cc614 100644
--- a/chrome/test/data/extensions/trigger_actions/page_action_popup/manifest.json
+++ b/chrome/test/data/extensions/trigger_actions/page_action_popup/manifest.json
@@ -10,6 +10,6 @@
   ],
   "page_action": {
       "default_icon": "icon.png",
-      "popup": "popup.html"
+      "default_popup": "popup.html"
   }
 }
diff --git a/chrome/test/webdriver/test/infobar_browser_action_extension/manifest.json b/chrome/test/webdriver/test/infobar_browser_action_extension/manifest.json
index 0456f4b..cfee923 100644
--- a/chrome/test/webdriver/test/infobar_browser_action_extension/manifest.json
+++ b/chrome/test/webdriver/test/infobar_browser_action_extension/manifest.json
@@ -6,7 +6,7 @@
     "page": "bg.html"
   },
   "browser_action": {
-    "popup": "view_checks.html"
+    "default_popup": "view_checks.html"
   },
   "permissions": [
     "tabs",