Reland restrict extension features based on the extension type.

chrome/common/extensions/extension_manifests_unittest.cc

Index: chrome/common/extensions/extension_manifests_unittest.cc
diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc
index adc696960409b88d769b7184081fe0e9b1bffee5..8136deaf04142acfaa504971784430cb84794093 100644
--- a/chrome/common/extensions/extension_manifests_unittest.cc
+++ b/chrome/common/extensions/extension_manifests_unittest.cc
@@ -588,12 +588,8 @@ TEST_F(ExtensionManifestTest, Sidebar) {
             extension->sidebar_defaults()->default_page().spec());
 }
 
-TEST_F(ExtensionManifestTest, DisallowHybridApps) {
-  LoadAndExpectError("disallow_hybrid_1.json",
-      ExtensionErrorUtils::FormatErrorMessage(
-          errors::kHostedAppsCannotIncludeExtensionFeatures,
-          keys::kBrowserAction));
-  LoadAndExpectError("disallow_hybrid_2.json",
+TEST_F(ExtensionManifestTest, BackgroundPermission) {
+  LoadAndExpectError("background_permission.json",
                      errors::kBackgroundPermissionNeeded);
 }
 
@@ -742,9 +738,7 @@ TEST_F(ExtensionManifestTest, NormalizeIconPaths) {
 }
 
 TEST_F(ExtensionManifestTest, DisallowMultipleUISurfaces) {
-  LoadAndExpectError("multiple_ui_surfaces_1.json", errors::kOneUISurfaceOnly);
-  LoadAndExpectError("multiple_ui_surfaces_2.json", errors::kOneUISurfaceOnly);
-  LoadAndExpectError("multiple_ui_surfaces_3.json", errors::kOneUISurfaceOnly);
+  LoadAndExpectError("multiple_ui_surfaces.json", errors::kOneUISurfaceOnly);
 }
 
 TEST_F(ExtensionManifestTest, ParseHomepageURLs) {