Reland restrict extension features based on the extension type.

chrome/common/extensions/extension_manifests_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 571 matching lines @@
             ASCIIToUTF16("Default title"));
   EXPECT_EQ(extension->sidebar_defaults()->default_icon_path(),
             "icon.png");
   EXPECT_EQ(extension->url().spec() + "sidebar.html",
             extension->sidebar_defaults()->default_page().spec());
 }
 
 TEST_F(ExtensionManifestTest, DisallowHybridApps) {
   LoadAndExpectError("disallow_hybrid_1.json",
       ExtensionErrorUtils::FormatErrorMessage(
-          errors::kHostedAppsCannotIncludeExtensionFeatures,
+          errors::kFeatureNotAllowed,
           keys::kBrowserAction));
   LoadAndExpectError("disallow_hybrid_2.json",
                      errors::kBackgroundPermissionNeeded);
 }
 
 TEST_F(ExtensionManifestTest, OptionsPageInApps) {
   scoped_refptr<Extension> extension;
 
   // Allow options page with absolute URL in hosted apps.
   extension = LoadAndExpectSuccess("hosted_app_absolute_options.json");
@@ skipping 125 matching lines @@
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("normalize_icon_paths.json"));
   EXPECT_EQ("16.png",
             extension->icons().Get(16, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("48.png",
             extension->icons().Get(48, ExtensionIconSet::MATCH_EXACTLY));
 }
 
 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_2.json",
+                     ExtensionErrorUtils::FormatErrorMessage(
+                         errors::kFeatureNotAllowed,
+                         keys::kBrowserAction));
+  LoadAndExpectError("multiple_ui_surfaces_3.json",
+                     ExtensionErrorUtils::FormatErrorMessage(
+                         errors::kFeatureNotAllowed,
+                         keys::kBrowserAction));
 }
 
 TEST_F(ExtensionManifestTest, ParseHomepageURLs) {
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("homepage_valid.json"));
   LoadAndExpectError("homepage_empty.json",
                      extension_manifest_errors::kInvalidHomepageURL);
   LoadAndExpectError("homepage_invalid.json",
                      extension_manifest_errors::kInvalidHomepageURL);
   LoadAndExpectError("homepage_bad_schema.json",
@@ skipping 203 matching lines @@
   scoped_refptr<Extension> extension_2(
       LoadAndExpectSuccess("offline_disabled_packaged_app.json"));
   EXPECT_FALSE(extension_2->offline_enabled());
   scoped_refptr<Extension> extension_3(
       LoadAndExpectSuccess("offline_default_packaged_app.json"));
   EXPECT_FALSE(extension_3->offline_enabled());
   scoped_refptr<Extension> extension_4(
       LoadAndExpectSuccess("offline_enabled_hosted_app.json"));
   EXPECT_TRUE(extension_4->offline_enabled());
 }