Renamed packaged_app to legacy_packaged_app in extension feature files. It's

confusing otherwise since the C++ enum is called LEGACY_PACKAGED_APP.

Review URL: https://chromiumcodereview.appspot.com/23691012

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

7 files changed, 138 insertions, 135 deletions

diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index 9543fd2..d29892f 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -20,7 +20,7 @@
   },
   "app": {
     "channel": "stable",
-    "extension_types": ["hosted_app", "extension", "packaged_app"],
+    "extension_types": ["hosted_app", "extension", "legacy_packaged_app"],
     "contexts": [
       "blessed_extension", "unblessed_extension", "content_script", "web_page"
     ],
@@ -219,7 +219,7 @@
   },
   "extension": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "contexts": ["blessed_extension"]
   },
   "extension.getURL": {
@@ -275,7 +275,7 @@
   },
   "i18n": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "contexts": ["blessed_extension", "unblessed_extension", "content_script"]
   },
   "identity": {
@@ -310,7 +310,7 @@
   },
   "logPrivate": {
     "dependencies": ["permission:logPrivate"],
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "contexts": ["blessed_extension"]
   },
   "management": {
@@ -320,12 +320,12 @@
   "management.getPermissionWarningsByManifest": {
     "dependencies": [],
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "management.uninstallSelf": {
     "dependencies": [],
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   // This is not a real API, only here for documentation purposes.
   // See http://crbug.com/275944 for background.
@@ -382,7 +382,7 @@
   },
   "permissions": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "contexts": "all",
     "matches": ["<all_urls>"]
   },
@@ -421,7 +421,7 @@
   },
   "runtime": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "contexts": ["blessed_extension"]
   },
   "runtime.connect": {
@@ -524,7 +524,7 @@
   },
   "tabs": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "contexts": ["blessed_extension"]
   },
   "terminalPrivate": {
@@ -551,7 +551,7 @@
   },
   "types": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "contexts": ["blessed_extension"]
   },
   "types.private": {
diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json
index 99a8833..5b27040 100644
--- a/chrome/common/extensions/api/_manifest_features.json
+++ b/chrome/common/extensions/api/_manifest_features.json
@@ -8,7 +8,7 @@
 {
   "app": {
     "channel": "stable",
-    "extension_types": ["packaged_app", "hosted_app", "platform_app"]
+    "extension_types": ["legacy_packaged_app", "hosted_app", "platform_app"]
   },
   // The default platform app CSP can only be overridden by whitelisted apps.
   // This is a separate key from the top-level content_security_policy one since
@@ -36,11 +36,11 @@
     "channel": "stable",
     // Platform apps always have isolated storage, thus they cannot specify it
     // via the manifest.
-    "extension_types": ["packaged_app", "hosted_app"]
+    "extension_types": ["legacy_packaged_app", "hosted_app"]
   },
   "app.launch": {
     "channel": "stable",
-    "extension_types": ["packaged_app", "hosted_app"]
+    "extension_types": ["legacy_packaged_app", "hosted_app"]
   },
   "author": {
     "channel": "stable",
@@ -50,20 +50,20 @@
     "channel": "stable",
     "extension_types": [
       // Platform apps specify their background page via app.background.
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ]
   },
   "background.persistent": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app"
+      "extension", "legacy_packaged_app"
     ],
     "min_manifest_version": 2
   },
   "background_page": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ],
     "max_manifest_version": 1
   },
@@ -73,7 +73,7 @@
   },
   "chrome_url_overrides": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "commands": {
     "channel": "stable",
@@ -89,16 +89,16 @@
     // Platform apps have a restricted content security policy that cannot be
     // overriden (except for a whitelist of exceptions, see the
     // app.content_security_policy whitelist).
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "content_scripts": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "converted_from_user_script": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ],
     "no_doc": true
   },
@@ -116,17 +116,17 @@
   },
   "devtools_page": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "display_in_launcher": [
     {
       "channel": "stable",
-      "extension_types": ["packaged_app", "platform_app"],
+      "extension_types": ["legacy_packaged_app", "platform_app"],
       "location": "component"
     },
     {
       "channel": "stable",
-      "extension_types": ["packaged_app", "platform_app"],
+      "extension_types": ["legacy_packaged_app", "platform_app"],
       "whitelist": [
         "nmmhkkegccagdldgiimedpiccmgmieda"
       ]
@@ -135,12 +135,12 @@
   "display_in_new_tab_page": [
     {
       "channel": "stable",
-      "extension_types": ["packaged_app", "platform_app"],
+      "extension_types": ["legacy_packaged_app", "platform_app"],
       "location": "component"
     },
     {
       "channel": "stable",
-      "extension_types": ["packaged_app", "platform_app"],
+      "extension_types": ["legacy_packaged_app", "platform_app"],
       "whitelist": [
         "nmmhkkegccagdldgiimedpiccmgmieda"
       ]
@@ -163,12 +163,12 @@
   "externally_connectable": {
     "channel": "stable",
     "extension_types": [
-      "extension", "hosted_app", "packaged_app", "platform_app"
+      "extension", "hosted_app", "legacy_packaged_app", "platform_app"
     ]
   },
   "file_browser_handlers": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "file_handlers": {
     "channel": "stable",
@@ -176,7 +176,7 @@
   },
   "homepage_url": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "icons": {
     "channel": "stable",
@@ -188,11 +188,11 @@
   },
   "incognito": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "input_components": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "key": {
     "channel": "stable",
@@ -214,7 +214,7 @@
   },
   "mime_types": {
     "channel": "stable",
-    "extension_types": [ "extension", "packaged_app", "platform_app" ],
+    "extension_types": [ "extension", "legacy_packaged_app", "platform_app" ],
     "whitelist": [
       "oickdpebdnfbgkcaoklfcdhjniefkcji",  // browser_tests
       "gbkeegbaiigmenfmjfclcdgdpimamgkj",  // QuickOffice
@@ -226,13 +226,13 @@
   "minimum_chrome_version": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "nacl_modules": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "name": {
@@ -242,7 +242,7 @@
   "oauth2": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "platform_app"
+      "extension", "legacy_packaged_app", "platform_app"
     ]
   },
   "oauth2.auto_approve": {
@@ -262,23 +262,23 @@
   "offline_enabled": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "omnibox": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "optional_permissions": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "options_page": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ]
   },
   "page_action": {
@@ -293,7 +293,7 @@
   "permissions": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "platforms": {
@@ -302,18 +302,18 @@
   },
   "plugins": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "hosted_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "hosted_app"]
   },
   "requirements": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "sandbox": {
     "channel": "stable",
     "extension_types": [
-      "extension", "platform_app", "packaged_app"
+      "extension", "platform_app", "legacy_packaged_app"
     ],
     "min_manifest_version": 2
   },
@@ -335,17 +335,17 @@
   },
   "storage": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
   "storage.managed_schema": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
   "system_indicator": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "theme": {
     "channel": "stable",
@@ -353,7 +353,7 @@
   },
   "tts_engine": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "update_url": {
     "channel": "stable",
@@ -366,7 +366,7 @@
   "web_accessible_resources": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ]
   }
 }
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index af16181..c5ca17b 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -8,7 +8,7 @@
 {
   "activeTab": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "min_manifest_version": 2
   },
   "activityLogPrivate": {
@@ -25,7 +25,7 @@
   },
   "alarms": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
   "app.runtime": {
@@ -52,7 +52,7 @@
   ],
   "autotestPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "audioCapture": {
@@ -62,7 +62,7 @@
   "background": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app"
+      "extension", "legacy_packaged_app", "hosted_app"
     ]
   },
   "bluetooth": {
@@ -75,20 +75,20 @@
   },
   "bookmarkManagerPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "bookmarks": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "browsingData": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "chromePrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "whitelist": [
       "haiffjcadagjlijoggckpgfnoeiflnem",  // Citrix Receiver
       "gnedhmakppccajfpfiihfcdlnpgomkcf",  // Citrix Receiver Beta
@@ -97,7 +97,7 @@
   },
   "chromeosInfoPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578",  // http://crbug.com/234235
       "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB"   // http://crbug.com/234235
@@ -106,37 +106,37 @@
   "clipboardRead": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "clipboardWrite": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "cloudPrintPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     // CloudPrint
     "whitelist": ["mfehgcgbbipciphmccgaenjidiccnmng"]
   },
   "commandLinePrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "location": "component"
   },
   "contentSettings": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "contextMenus": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "cookies": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "diagnostics": [
     {
@@ -155,7 +155,7 @@
   ],
   "debugger": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "developerPrivate": {
     "channel": "dev",
@@ -169,7 +169,7 @@
   },
   "devtools": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "declarativeContent": {
     "channel": "trunk",
@@ -178,11 +178,11 @@
   "declarativeWebRequest": [
     {
       "channel": "beta",
-      "extension_types": ["extension", "packaged_app"]
+      "extension_types": ["extension", "legacy_packaged_app"]
     },
     {
       "channel": "stable",
-      "extension_types": ["extension", "packaged_app"],
+      "extension_types": ["extension", "legacy_packaged_app"],
       // Legacy Browser Support (remove once this API hits stable).
       "whitelist": ["heildphpnddilhkemkielfhnkaagiabh"]
     }
@@ -223,7 +223,7 @@
   },
   "enterprise.platformKeysPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "whitelist": [
       "inmdanhiiibfpdlljnjjbchhjgelojnn",  // Dogfood
       "cbpmgnfekbgbgpkmokfppmldaccjcbnb"   // Test
@@ -232,7 +232,7 @@
   "experimental": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "feedbackPrivate": {
@@ -246,11 +246,11 @@
   },
   "fileBrowserHandler": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "fileBrowserPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "fileSystem": [{
@@ -279,7 +279,7 @@
   }],
   "fontSettings": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "fullscreen": {
     "channel": "stable",
@@ -288,12 +288,12 @@
   "geolocation": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "history": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "identity": {
     "channel": "stable",
@@ -302,26 +302,26 @@
   "identityPrivate": {
     "channel": "stable",
     "extension_types": [
-      "packaged_app"
+      "legacy_packaged_app"
     ],
     "location": "component"
   },
   "idle": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "infobars": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "input": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "inplies_full_url_access": true
   },
   "inputMethodPrivate": [{
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       "haiffjcadagjlijoggckpgfnoeiflnem",  // Citrix Receiver
       "gnedhmakppccajfpfiihfcdlnpgomkcf",  // Citrix Receiver Beta
@@ -331,33 +331,33 @@
     ]
   },{
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "location": "component"
   }],
   "location": [
     {
       "channel": "dev",
       "extension_types": [
-        "extension", "packaged_app", "platform_app"
+        "extension", "legacy_packaged_app", "platform_app"
       ]
     },
     {
       "channel": "stable",
       "extension_types": [
-        "extension", "packaged_app", "hosted_app", "platform_app"
+        "extension", "legacy_packaged_app", "hosted_app", "platform_app"
       ],
       "location": "component"
     }
   ],
   "logPrivate": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "management": [
     {
       "channel": "stable",
-      "extension_types": ["extension", "packaged_app"]
+      "extension_types": ["extension", "legacy_packaged_app"]
     },
     {
       "channel": "stable",
@@ -399,12 +399,12 @@
   },
   "mediaPlayerPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "metricsPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       // The file manager and Google Now are component extensions, and they can
       // currently use whitelisted interfaces without being on the corresponding
@@ -435,12 +435,12 @@
   "nativeMessaging": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "platform_app"
+      "extension", "legacy_packaged_app", "platform_app"
     ]
   },
   "networkingPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       "pkedcjkdefgpdelpbcmbmeomcjbeemfm",  // Trusted Tester
       "fmfcbgogabcbclcofgocippekhfcmgfj",  // Staging
@@ -461,17 +461,17 @@
     // notifications permission with WebKit/Blink notifications.
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "echoPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "pageCapture": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "pointerLock": {
     "channel": "stable",
@@ -479,12 +479,12 @@
   },
   "plugin": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "power": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "platform_app"
+      "extension", "legacy_packaged_app", "platform_app"
     ]
   },
   "preferencesPrivate":  {
@@ -496,7 +496,7 @@
   },
   "privacy": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "processes": {
     "channel": "dev",
@@ -504,7 +504,7 @@
   },
   "proxy": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "pushMessaging": {
     "channel": "stable",
@@ -519,7 +519,7 @@
   },
   "rtcPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "whitelist": [
       "nckgahadagoaajjgafhacjanaoiihapd",  // Google Talk prod
       "eggnbpckecmjlblplehfpjjdhhidfdoj",  // Google Talk beta
@@ -531,11 +531,11 @@
   // values to verify restrictions.
   "runtime": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "screensaver": {
     "channel": "stable",
-    "extension_types": ["packaged_app", "hosted_app", "platform_app"]
+    "extension_types": ["legacy_packaged_app", "hosted_app", "platform_app"]
   },
   "serial": {
     "channel": "stable",
@@ -543,11 +543,11 @@
   },
   "sessions": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "streamsPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       "oickdpebdnfbgkcaoklfcdhjniefkcji",  // browser_tests
       "gbkeegbaiigmenfmjfclcdgdpimamgkj",  // QuickOffice
@@ -579,44 +579,44 @@
   },
   "systemIndicator": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "storage": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
   "system.cpu": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "system.memory": {
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "system.storage": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "system.display": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "systemPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "location": "component"
   },
   "tabs": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "tabCapture": [{
     "channel": "dev",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   }, {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "whitelist": [
       "pkedcjkdefgpdelpbcmbmeomcjbeemfm",  // Trusted Tester
       "fmfcbgogabcbclcofgocippekhfcmgfj",  // Staging
@@ -627,7 +627,7 @@
   }],
   "terminalPrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"],
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "whitelist": [
       "pnhechapfaindjhompbnflcldabbghjo",  // HTerm
       "okddffdblfhhnmhodogpojmfkjmhinfp"   // HTerm dev
@@ -635,20 +635,20 @@
   },
   "topSites": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "tts": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app", "platform_app"]
+    "extension_types": ["extension", "legacy_packaged_app", "platform_app"]
   },
   "ttsEngine": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "unlimitedStorage": {
     "channel": "stable",
     "extension_types": [
-      "extension", "packaged_app", "hosted_app", "platform_app"
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
   "usb": {
@@ -670,11 +670,11 @@
   },
   "webNavigation": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "webstorePrivate": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"],
+    "extension_types": ["extension", "legacy_packaged_app"],
     "whitelist": [
       "ahfgeienlihckogmohjhadlkjgocpleb",  // Web Store
       "afchcafgojfnemjkcbhfekplkmjaldaa"   // Enterprise Web Store
@@ -682,11 +682,11 @@
   },
   "webRequest": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "webRequestBlocking": {
     "channel": "stable",
-    "extension_types": ["extension", "packaged_app"]
+    "extension_types": ["extension", "legacy_packaged_app"]
   },
   "webview": {
     "channel": "stable",
diff --git a/chrome/common/extensions/features/base_feature_provider_unittest.cc b/chrome/common/extensions/features/base_feature_provider_unittest.cc
index 30f6abb..d31d3de 100644
--- a/chrome/common/extensions/features/base_feature_provider_unittest.cc
+++ b/chrome/common/extensions/features/base_feature_provider_unittest.cc
@@ -146,15 +146,15 @@ TEST(BaseFeatureProviderTest, Validation) {
 TEST(BaseFeatureProviderTest, ComplexFeatures) {
   scoped_ptr<base::DictionaryValue> rule(
       DictionaryBuilder()
-      .Set("feature1",
-           ListBuilder().Append(DictionaryBuilder()
-                                .Set("channel", "beta")
-                                .Set("extension_types",
-                                     ListBuilder().Append("extension")))
-                        .Append(DictionaryBuilder()
-                                .Set("channel", "beta")
-                                .Set("extension_types",
-                                     ListBuilder().Append("packaged_app"))))
+      .Set("feature1", ListBuilder()
+          .Append(DictionaryBuilder()
+              .Set("channel", "beta")
+              .Set("extension_types", ListBuilder()
+                  .Append("extension")))
+                  .Append(DictionaryBuilder()
+                      .Set("channel", "beta")
+                      .Set("extension_types", ListBuilder()
+                          .Append("legacy_packaged_app"))))
       .Build());
 
   scoped_ptr<BaseFeatureProvider> provider(
diff --git a/chrome/common/extensions/features/complex_feature_unittest.cc b/chrome/common/extensions/features/complex_feature_unittest.cc
index 6e7ed65..51f26f6 100644
--- a/chrome/common/extensions/features/complex_feature_unittest.cc
+++ b/chrome/common/extensions/features/complex_feature_unittest.cc
@@ -41,15 +41,17 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesWhitelist) {
   scoped_ptr<base::DictionaryValue> rule(
       DictionaryBuilder()
       .Set("whitelist", ListBuilder().Append(kIdFoo))
-      .Set("extension_types", ListBuilder().Append("extension")).Build());
+      .Set("extension_types", ListBuilder()
+          .Append("extension")).Build());
   simple_feature->Parse(rule.get());
   features->push_back(simple_feature.release());
 
-  // Rule: "packaged_app", whitelist "bar".
+  // Rule: "legacy_packaged_app", whitelist "bar".
   simple_feature.reset(new SimpleFeature());
   rule = DictionaryBuilder()
       .Set("whitelist", ListBuilder().Append(kIdBar))
-      .Set("extension_types", ListBuilder().Append("packaged_app")).Build();
+      .Set("extension_types", ListBuilder()
+          .Append("legacy_packaged_app")).Build();
   simple_feature->Parse(rule.get());
   features->push_back(simple_feature.release());
 
@@ -98,11 +100,12 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesChannels) {
   simple_feature->Parse(rule.get());
   features->push_back(simple_feature.release());
 
-  // Rule: "packaged_app", channel stable.
+  // Rule: "legacy_packaged_app", channel stable.
   simple_feature.reset(new SimpleFeature());
   rule = DictionaryBuilder()
       .Set("channel", "stable")
-      .Set("extension_types", ListBuilder().Append("packaged_app")).Build();
+      .Set("extension_types", ListBuilder()
+          .Append("legacy_packaged_app")).Build();
   simple_feature->Parse(rule.get());
   features->push_back(simple_feature.release());
 
diff --git a/chrome/common/extensions/features/simple_feature.cc b/chrome/common/extensions/features/simple_feature.cc
index e8ee3d5..81f50c9 100644
--- a/chrome/common/extensions/features/simple_feature.cc
+++ b/chrome/common/extensions/features/simple_feature.cc
@@ -26,7 +26,7 @@ struct Mappings {
   Mappings() {
     extension_types["extension"] = Manifest::TYPE_EXTENSION;
     extension_types["theme"] = Manifest::TYPE_THEME;
-    extension_types["packaged_app"] = Manifest::TYPE_LEGACY_PACKAGED_APP;
+    extension_types["legacy_packaged_app"] = Manifest::TYPE_LEGACY_PACKAGED_APP;
     extension_types["hosted_app"] = Manifest::TYPE_HOSTED_APP;
     extension_types["platform_app"] = Manifest::TYPE_PLATFORM_APP;
     extension_types["shared_module"] = Manifest::TYPE_SHARED_MODULE;
diff --git a/chrome/common/extensions/features/simple_feature_unittest.cc b/chrome/common/extensions/features/simple_feature_unittest.cc
index fc7967f..4129d6f 100644
--- a/chrome/common/extensions/features/simple_feature_unittest.cc
+++ b/chrome/common/extensions/features/simple_feature_unittest.cc
@@ -376,7 +376,7 @@ TEST_F(ExtensionSimpleFeatureTest, ParsePackageTypes) {
   base::ListValue* extension_types = new base::ListValue();
   extension_types->Append(new base::StringValue("extension"));
   extension_types->Append(new base::StringValue("theme"));
-  extension_types->Append(new base::StringValue("packaged_app"));
+  extension_types->Append(new base::StringValue("legacy_packaged_app"));
   extension_types->Append(new base::StringValue("hosted_app"));
   extension_types->Append(new base::StringValue("platform_app"));
   extension_types->Append(new base::StringValue("shared_module"));