Revert "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 570 matching lines @@
   scoped_refptr<Extension> extension(LoadAndExpectSuccess("sidebar.json"));
   ASSERT_TRUE(extension->sidebar_defaults() != NULL);
   EXPECT_EQ(extension->sidebar_defaults()->default_title(),
             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, BackgroundPermission) {
-  LoadAndExpectError("background_permission.json",
+TEST_F(ExtensionManifestTest, DisallowHybridApps) {
+  LoadAndExpectError("disallow_hybrid_1.json",
+      ExtensionErrorUtils::FormatErrorMessage(
+          errors::kHostedAppsCannotIncludeExtensionFeatures,
+          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");
   EXPECT_STREQ("http",
                extension->options_url().scheme().c_str());
@@ skipping 128 matching lines @@
 TEST_F(ExtensionManifestTest, NormalizeIconPaths) {
   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.json", errors::kOneUISurfaceOnly);
+  LoadAndExpectError("multiple_ui_surfaces_1.json", errors::kOneUISurfaceOnly);
+  LoadAndExpectError("multiple_ui_surfaces_2.json", errors::kOneUISurfaceOnly);
+  LoadAndExpectError("multiple_ui_surfaces_3.json", errors::kOneUISurfaceOnly);
 }
 
 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 236 matching lines @@
   // This guy is identical to the previous but doesn't ask for any
   // platform-app-only permissions. We should be able to load him and ask
   // questions about his permissions.
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("not_platform_app.json"));
   ExtensionAPIPermissionSet apis = extension->GetActivePermissions()->apis();
   for (ExtensionAPIPermissionSet::const_iterator i = apis.begin();
        i != apis.end(); ++i)
     EXPECT_NE(platform_app, info->GetByID(*i)->type_restrictions());
 }