Reland restrict extension features based on the extension type.

chrome/common/extensions/extension_constants.h

Index: chrome/common/extensions/extension_constants.h
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 8c988f3fc8b7e11bd591e41dccdf8d92bfd15767..abb77f04f0fadf4a223ea79c2fb9d691ed39da24 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -150,7 +150,7 @@ namespace extension_manifest_errors {
   extern const char kDisabledByPolicy[];
   extern const char kExperimentalFlagRequired[];
   extern const char kExpectString[];
-  extern const char kHostedAppsCannotIncludeExtensionFeatures[];
+  extern const char kFeatureNotAllowed[];
   extern const char kInvalidAllFrames[];
   extern const char kInvalidBackground[];
   extern const char kInvalidBackgroundInHostedApp[];
@@ -280,7 +280,6 @@ namespace extension_manifest_errors {
   extern const char kOneUISurfaceOnly[];
   extern const char kReservedMessageFound[];
   extern const char kSidebarExperimental[];
-  extern const char kThemesCannotContainExtensions[];
   extern const char kWebContentMustBeEnabled[];
 #if defined(OS_CHROMEOS)
   extern const char kIllegalPlugins[];