36 files changed, 76 insertions, 77 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2e97de6..2ad33ec 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4382,9 +4382,6 @@ Make sure you do not expose any sensitive information.
       <message name="IDS_EXTENSION_PROMPT_WARNING_NATIVE_MESSAGING" desc="Permission string for Native Messaging API.">
         Communicate with cooperating native applications
       </message>
-      <message name="IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE" desc="Permission string for allowing websites to connect to extensions.">
-        Communicate with cooperating websites
-      </message>
       <message name="IDS_EXTENSION_PROMPT_WARNING_SCREENLOCK_PRIVATE" desc="Permission string for locking an unlocking the screen.">
         Lock and unlock the screen
       </message>
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d5296d9..04cde22 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -17,8 +17,6 @@
       # they should be kept here.
       '../extensions/common/extension_l10n_util_unittest.cc',
       '../extensions/common/file_util_unittest.cc',
-      '../extensions/common/manifest_handlers/externally_connectable_unittest.cc',
-      '../extensions/common/manifest_handlers/file_handler_manifest_unittest.cc',
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
diff --git a/chrome/common/extensions/api/_manifest_features.json b/chrome/common/extensions/api/_manifest_features.json
index 9c119117..ee6a5ed 100644
--- a/chrome/common/extensions/api/_manifest_features.json
+++ b/chrome/common/extensions/api/_manifest_features.json
@@ -170,12 +170,6 @@
       "extension_types": ["shared_module"]
     }
   ],
-  "externally_connectable": {
-    "channel": "stable",
-    "extension_types": [
-      "extension", "hosted_app", "legacy_packaged_app", "platform_app"
-    ]
-  },
   "file_browser_handlers": [
     {
       "channel": "stable",
@@ -187,27 +181,10 @@
       "location": "component"
     }
   ],
-  "file_handlers": [
-  {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  }, {
-    "channel": "stable",
-    "extension_types": [ "extension"],
-    "whitelist": [
-      "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
-      "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
-      "12E618C3C6E97495AAECF2AC12DEB082353241C6"   // QO component extension
-    ]
-  }],
   "homepage_url": {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"]
   },
-  "icons": {
-    "channel": "stable",
-    "extension_types": "all"
-  },
   "import": {
     "channel": "stable",
     "extension_types": "all"
@@ -220,20 +197,6 @@
     "channel": "stable",
     "extension_types": "all"
   },
-  "launcher_page": {
-    "channel": "stable",
-    "min_manifest_version": 2,
-    "extension_types": ["platform_app"],
-    "whitelist": [
-      "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/404000
-      "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/404000
-      "11A01C82EF355E674E4F9728A801F5C3CB40D83F"   // http://crbug.com/404000
-    ]
-  },
-  "manifest_version": {
-    "channel": "stable",
-    "extension_types": "all"
-  },
   "mime_types": {
     "channel": "stable",
     "extension_types": [ "extension", "legacy_packaged_app", "platform_app" ],
@@ -264,16 +227,6 @@
       "extension", "legacy_packaged_app", "hosted_app", "platform_app"
     ]
   },
-  "nacl_modules": {
-    "channel": "stable",
-    "extension_types": [
-      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
-    ]
-  },
-  "name": {
-    "channel": "stable",
-    "extension_types": "all"
-  },
   "oauth2": {
     "channel": "stable",
     "extension_types": [
@@ -400,9 +353,5 @@
   "url_handlers": {
     "channel": "stable",
     "extension_types": ["platform_app"]
-  },
-  "version": {
-    "channel": "stable",
-    "extension_types": "all"
   }
 }
diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc
index 93dd8d3..44b8167 100644
--- a/chrome/common/extensions/chrome_manifest_handlers.cc
+++ b/chrome/common/extensions/chrome_manifest_handlers.cc
@@ -34,7 +34,6 @@
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "extensions/common/api/bluetooth/bluetooth_manifest_handler.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
-#include "extensions/common/manifest_handlers/externally_connectable.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/manifest_handlers/requirements_info.h"
 
@@ -53,7 +52,6 @@ void RegisterChromeManifestHandlers() {
   (new ContentScriptsHandler)->Register();
   (new DefaultLocaleHandler)->Register();
   (new DevToolsPageHandler)->Register();
-  (new ExternallyConnectableHandler)->Register();
   (new FileBrowserHandlerParser)->Register();
   (new HomepageURLHandler)->Register();
 #if defined(OS_CHROMEOS)
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
index e4c6ccb..14c5578 100644
--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc
+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -63,14 +63,6 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
        APIPermissionInfo::kFlagCannotBeOptional},
       {APIPermission::kEmbeddedExtensionOptions, "embeddedExtensionOptions",
        APIPermissionInfo::kFlagCannotBeOptional},
-      // NOTE(kalman): this is provided by a manifest property but needs to
-      // appear in the install permission dialogue, so we need a fake
-      // permission for it. See http://crbug.com/247857.
-      {APIPermission::kWebConnectable, "webConnectable",
-       APIPermissionInfo::kFlagCannotBeOptional |
-           APIPermissionInfo::kFlagInternal,
-       IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
-       PermissionMessage::kWebConnectable},
       {APIPermission::kGeolocation, "geolocation",
        APIPermissionInfo::kFlagCannotBeOptional,
        IDS_EXTENSION_PROMPT_WARNING_GEOLOCATION,
diff --git a/extensions/DEPS b/extensions/DEPS
index 7cfd017..2286ed4 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -39,11 +39,7 @@ specific_include_rules = {
     "+chrome/browser/ui/browser.h",
     "+chrome/common/chrome_paths.h",
     "+chrome/common/extensions/features/feature_channel.h",
-    "+chrome/common/extensions/manifest_tests/chrome_manifest_test.h",
     "+chrome/test/base/testing_profile.h",
     "+chrome/test/base/ui_test_utils.h",
   ],
-  "(simple|complex)_feature_unittest\.cc|base_feature_provider_unittest\.cc": [
-    "+chrome/common/extensions/features/chrome_channel_feature_filter.h",
-  ],
 }
diff --git a/extensions/common/api/_manifest_features.json b/extensions/common/api/_manifest_features.json
index 7d5290d..10cd833 100644
--- a/extensions/common/api/_manifest_features.json
+++ b/extensions/common/api/_manifest_features.json
@@ -70,6 +70,30 @@
     "channel": "stable",
     "extension_types": "all"
   },
+  "externally_connectable": {
+    "channel": "stable",
+    "extension_types": [
+      "extension", "hosted_app", "legacy_packaged_app", "platform_app"
+    ]
+  },
+  "file_handlers": [
+    {
+      "channel": "stable",
+      "extension_types": ["platform_app"]
+    }, {
+      "channel": "stable",
+      "extension_types": [ "extension"],
+      "whitelist": [
+        "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
+        "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
+        "12E618C3C6E97495AAECF2AC12DEB082353241C6"   // QO component extension
+      ]
+    }
+  ],
+  "icons": {
+    "channel": "stable",
+    "extension_types": "all"
+  },
   "incognito": [
     {
       "channel": "stable",
@@ -93,6 +117,30 @@
       "platform_app"
     ]
   },
+  "launcher_page": {
+    "channel": "stable",
+    "min_manifest_version": 2,
+    "extension_types": ["platform_app"],
+    "whitelist": [
+      "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/404000
+      "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/404000
+      "11A01C82EF355E674E4F9728A801F5C3CB40D83F"   // http://crbug.com/404000
+    ]
+  },
+  "manifest_version": {
+    "channel": "stable",
+    "extension_types": "all"
+  },
+  "nacl_modules": {
+    "channel": "stable",
+    "extension_types": [
+      "extension", "legacy_packaged_app", "hosted_app", "platform_app"
+    ]
+  },
+  "name": {
+    "channel": "stable",
+    "extension_types": "all"
+  },
   "offline_enabled": {
     "channel": "stable",
     "extension_types": [
@@ -114,6 +162,10 @@
     "channel": "stable",
     "extension_types": ["platform_app"]
   },
+  "version": {
+    "channel": "stable",
+    "extension_types": "all"
+  },
   "web_accessible_resources": [
     {
       "channel": "stable",
diff --git a/extensions/common/common_manifest_handlers.cc b/extensions/common/common_manifest_handlers.cc
index 1ce1637..37330ef 100644
--- a/extensions/common/common_manifest_handlers.cc
+++ b/extensions/common/common_manifest_handlers.cc
@@ -7,6 +7,7 @@
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/csp_info.h"
+#include "extensions/common/manifest_handlers/externally_connectable.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
@@ -23,9 +24,11 @@ namespace extensions {
 
 void RegisterCommonManifestHandlers() {
   DCHECK(!ManifestHandler::IsRegistrationFinalized());
+#if defined(ENABLE_EXTENSIONS)
   (new BackgroundManifestHandler)->Register();
   (new CSPHandler(false))->Register();
   (new CSPHandler(true))->Register();
+  (new ExternallyConnectableHandler)->Register();
   (new FileHandlersParser)->Register();
   (new IconsHandler)->Register();
   (new IncognitoHandler)->Register();
@@ -39,6 +42,7 @@ void RegisterCommonManifestHandlers() {
   (new SharedModuleHandler)->Register();
   (new WebAccessibleResourcesHandler)->Register();
   (new WebviewHandler)->Register();
+#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 }  // namespace extensions
diff --git a/extensions/common/manifest_handlers/externally_connectable_unittest.cc b/extensions/common/manifest_handlers/externally_connectable_unittest.cc
index 87e29cc..7064869 100644
--- a/extensions/common/manifest_handlers/externally_connectable_unittest.cc
+++ b/extensions/common/manifest_handlers/externally_connectable_unittest.cc
@@ -4,10 +4,10 @@
 
 #include <algorithm>
 
-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/externally_connectable.h"
+#include "extensions/common/manifest_test.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -18,8 +18,7 @@ namespace extensions {
 
 namespace errors = externally_connectable_errors;
 
-// TODO(jamescook): Convert from ChromeManifestTest to ManifestTest.
-class ExternallyConnectableTest : public ChromeManifestTest {
+class ExternallyConnectableTest : public ManifestTest {
  public:
   ExternallyConnectableTest() {}
   virtual ~ExternallyConnectableTest() {}
diff --git a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
index f45d922..5934dc0 100644
--- a/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
+++ b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
@@ -2,18 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/file_handler_info.h"
+#include "extensions/common/manifest_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace errors = manifest_errors;
 
-// TODO(jamescook): Convert from ChromeManifestTest to ManifestTest.
-class FileHandlersManifestTest : public ChromeManifestTest {
-};
+typedef ManifestTest FileHandlersManifestTest;
 
 TEST_F(FileHandlersManifestTest, InvalidFileHandlers) {
   Testcase testcases[] = {
diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc
index b4b2ddf..efad143 100644
--- a/extensions/common/permissions/extensions_api_permissions.cc
+++ b/extensions/common/permissions/extensions_api_permissions.cc
@@ -4,6 +4,8 @@
 
 #include "extensions/common/permissions/extensions_api_permissions.h"
 
+#include <vector>
+
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/socket_permission.h"
@@ -65,6 +67,14 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
       {APIPermission::kVideoCapture, "videoCapture",
        APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
        PermissionMessage::kVideoCapture},
+      // NOTE(kalman): This is provided by a manifest property but needs to
+      // appear in the install permission dialogue, so we need a fake
+      // permission for it. See http://crbug.com/247857.
+      {APIPermission::kWebConnectable, "webConnectable",
+       APIPermissionInfo::kFlagCannotBeOptional |
+           APIPermissionInfo::kFlagInternal,
+       IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
+       PermissionMessage::kWebConnectable},
       {APIPermission::kWebView, "webview",
        APIPermissionInfo::kFlagCannotBeOptional},
       {APIPermission::kWindowShape, "app.window.shape"},
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index c5a1e0c..9374ed8 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -1096,6 +1096,8 @@
         'common/features/complex_feature_unittest.cc',
         'common/features/simple_feature_unittest.cc',
         'common/manifest_handler_unittest.cc',
+        'common/manifest_handlers/externally_connectable_unittest.cc',
+        'common/manifest_handlers/file_handler_manifest_unittest.cc',
         'common/manifest_handlers/shared_module_manifest_unittest.cc',
         'common/message_bundle_unittest.cc',
         'common/one_shot_event_unittest.cc',
diff --git a/extensions/extensions_strings.grd b/extensions/extensions_strings.grd
index 1e0af62..f6a73d2 100644
--- a/extensions/extensions_strings.grd
+++ b/extensions/extensions_strings.grd
@@ -349,6 +349,10 @@
       <message name="IDS_EXTENSION_PROMPT_WARNING_U2F_DEVICES" desc="Warning message which indicates that an extension has access to Universal 2nd Factor devices.">
         Access your Universal 2nd Factor devices
       </message>
+      <message name="IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE" desc="Permission string for allowing websites to connect to extensions.">
+        Communicate with cooperating websites
+      </message>
+
     </messages>
   </release>
 </grit>
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_all_ids.json b/extensions/test/data/manifest_tests/externally_connectable_all_ids.json
index cad1d9f..cad1d9f 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_all_ids.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_all_ids.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_bad_id.json b/extensions/test/data/manifest_tests/externally_connectable_bad_id.json
index 0510058..0510058 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_bad_id.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_bad_id.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_all_urls.json b/extensions/test/data/manifest_tests/externally_connectable_error_all_urls.json
index 027284f..027284f 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_all_urls.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_all_urls.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_bad_matches.json b/extensions/test/data/manifest_tests/externally_connectable_error_bad_matches.json
index fdc8cc8..fdc8cc8 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_bad_matches.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_bad_matches.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_effective_tld.json b/extensions/test/data/manifest_tests/externally_connectable_error_effective_tld.json
index 3deb88d..3deb88d 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_effective_tld.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_effective_tld.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_tld.json b/extensions/test/data/manifest_tests/externally_connectable_error_tld.json
index 081cbf1..081cbf1 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_tld.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_tld.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_unknown_tld.json b/extensions/test/data/manifest_tests/externally_connectable_error_unknown_tld.json
index 0d1bb61..0d1bb61 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_unknown_tld.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_unknown_tld.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_wildcard_host.json b/extensions/test/data/manifest_tests/externally_connectable_error_wildcard_host.json
index 8814783..8814783 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_wildcard_host.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_wildcard_host.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_wrong_format.json b/extensions/test/data/manifest_tests/externally_connectable_error_wrong_format.json
index c100d74..c100d74 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_error_wrong_format.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_error_wrong_format.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_ids.json b/extensions/test/data/manifest_tests/externally_connectable_ids.json
index 95b252c..95b252c 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_ids.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_ids.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_ids_and_matches.json b/extensions/test/data/manifest_tests/externally_connectable_ids_and_matches.json
index 24652bf..24652bf 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_ids_and_matches.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_ids_and_matches.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_matches.json b/extensions/test/data/manifest_tests/externally_connectable_matches.json
index baf4e0f0..baf4e0f0 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_matches.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_matches.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_matches_tls_channel_id.json b/extensions/test/data/manifest_tests/externally_connectable_matches_tls_channel_id.json
index c6f0db9..c6f0db9 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_matches_tls_channel_id.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_matches_tls_channel_id.json
diff --git a/chrome/test/data/extensions/manifest_tests/externally_connectable_nothing_specified.json b/extensions/test/data/manifest_tests/externally_connectable_nothing_specified.json
index a6b5025..a6b5025 100644
--- a/chrome/test/data/extensions/manifest_tests/externally_connectable_nothing_specified.json
+++ b/extensions/test/data/manifest_tests/externally_connectable_nothing_specified.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_extension.json b/extensions/test/data/manifest_tests/file_handlers_invalid_extension.json
index d2f705d..d2f705d 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_extension.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_extension.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_extension_element.json b/extensions/test/data/manifest_tests/file_handlers_invalid_extension_element.json
index 9834f70..9834f70 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_extension_element.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_extension_element.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_handlers.json b/extensions/test/data/manifest_tests/file_handlers_invalid_handlers.json
index f1d65d1..f1d65d1 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_handlers.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_handlers.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_no_type_or_extension.json b/extensions/test/data/manifest_tests/file_handlers_invalid_no_type_or_extension.json
index 777c966..777c966 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_no_type_or_extension.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_no_type_or_extension.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_not_app.json b/extensions/test/data/manifest_tests/file_handlers_invalid_not_app.json
index a4f6d34..a4f6d34 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_not_app.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_not_app.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_too_many.json b/extensions/test/data/manifest_tests/file_handlers_invalid_too_many.json
index 8a47d03..8a47d03 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_too_many.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_too_many.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_type.json b/extensions/test/data/manifest_tests/file_handlers_invalid_type.json
index d51caa94..d51caa94 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_type.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_type.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_type_element.json b/extensions/test/data/manifest_tests/file_handlers_invalid_type_element.json
index 0714290..0714290 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_invalid_type_element.json
+++ b/extensions/test/data/manifest_tests/file_handlers_invalid_type_element.json
diff --git a/chrome/test/data/extensions/manifest_tests/file_handlers_valid.json b/extensions/test/data/manifest_tests/file_handlers_valid.json
index d943091..d943091 100644
--- a/chrome/test/data/extensions/manifest_tests/file_handlers_valid.json
+++ b/extensions/test/data/manifest_tests/file_handlers_valid.json