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 ecdb13dc192855215fa069f582a68fa95aa1bfa4..e71120086a9312b5e6b21f4566dce195aefc4f65 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -149,7 +149,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;
@@ -278,7 +278,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;