| Index: chrome/common/extensions/api/_manifest_features.json | 
| diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json | 
| index bad5d91f4ece524f4bb3720e5bf1cf3bf1e198e8..0a63b3af61ee691563a467992bfdd564ffc5393a 100644 | 
| --- a/chrome/common/extensions/api/_manifest_features.json | 
| +++ b/chrome/common/extensions/api/_manifest_features.json | 
| @@ -29,16 +29,16 @@ | 
| "extension_types": ["platform_app"], | 
| "min_manifest_version": 2 | 
| }, | 
| -  "app.launch": { | 
| -    "channel": "stable", | 
| -    "extension_types": ["packaged_app", "hosted_app"] | 
| -  }, | 
| "app.isolation": { | 
| "channel": "stable", | 
| // Platform apps always have isolated storage, thus they cannot specify it | 
| // via the manifest. | 
| "extension_types": ["packaged_app", "hosted_app"] | 
| }, | 
| +  "app.launch": { | 
| +    "channel": "stable", | 
| +    "extension_types": ["packaged_app", "hosted_app"] | 
| +  }, | 
| "author": { | 
| "channel": "stable", | 
| "extension_types": "all" | 
| @@ -143,14 +143,18 @@ | 
| ] | 
| } | 
| ], | 
| +  "export": { | 
| +    "channel": "dev", | 
| +    "extension_types": ["extension"], | 
| +    "whitelist": [ | 
| +      "oickdpebdnfbgkcaoklfcdhjniefkcji",  // browser_tests | 
| +      "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F" | 
| +    ] | 
| +  }, | 
| "file_browser_handlers": { | 
| "channel": "stable", | 
| "extension_types": ["extension", "packaged_app"] | 
| }, | 
| -  "media_galleries_handlers": { | 
| -    "channel": "stable", | 
| -    "extension_types": ["packaged_app", "platform_app"] | 
| -  }, | 
| "file_handlers": { | 
| "channel": "stable", | 
| "extension_types": ["platform_app"] | 
| @@ -163,6 +167,10 @@ | 
| "channel": "stable", | 
| "extension_types": "all" | 
| }, | 
| +  "import": { | 
| +    "channel": "dev", | 
| +    "extension_types": "all" | 
| +  }, | 
| "incognito": { | 
| "channel": "stable", | 
| "extension_types": ["extension", "packaged_app"] | 
| @@ -181,10 +189,20 @@ | 
| "channel": "stable", | 
| "extension_types": "all" | 
| }, | 
| +  "kiosk_enabled": { | 
| +    "channel": "stable", | 
| +    "extension_types": [ | 
| +      "platform_app" | 
| +    ] | 
| +  }, | 
| "manifest_version": { | 
| "channel": "stable", | 
| "extension_types": "all" | 
| }, | 
| +  "media_galleries_handlers": { | 
| +    "channel": "stable", | 
| +    "extension_types": ["packaged_app", "platform_app"] | 
| +  }, | 
| "mime_types": { | 
| "channel": "stable", | 
| "extension_types": [ "extension", "packaged_app", "platform_app" ], | 
| @@ -212,10 +230,10 @@ | 
| "channel": "stable", | 
| "extension_types": "all" | 
| }, | 
| -  "kiosk_enabled": { | 
| +  "oauth2": { | 
| "channel": "stable", | 
| "extension_types": [ | 
| -      "platform_app" | 
| +      "extension", "packaged_app", "platform_app" | 
| ] | 
| }, | 
| "offline_enabled": { | 
| @@ -240,12 +258,6 @@ | 
| "extension", "packaged_app", "hosted_app" | 
| ] | 
| }, | 
| -  "oauth2": { | 
| -    "channel": "stable", | 
| -    "extension_types": [ | 
| -      "extension", "packaged_app", "platform_app" | 
| -    ] | 
| -  }, | 
| "page_action": { | 
| "channel": "stable", | 
| "extension_types": ["extension"] | 
|  |