Allow app_shell to run past extension manifest parsing

chrome/common/extensions/chrome_manifest_handlers.cc

Index: chrome/common/extensions/chrome_manifest_handlers.cc
diff --git a/chrome/common/extensions/chrome_manifest_handlers.cc b/chrome/common/extensions/chrome_manifest_handlers.cc
index 486596c011257c30afab3f7200ffa94884c6b495..f8037d7a5839abac8d1e25e6da71342c1ddf3ba1 100644
--- a/chrome/common/extensions/chrome_manifest_handlers.cc
+++ b/chrome/common/extensions/chrome_manifest_handlers.cc
@@ -38,30 +38,18 @@
 #include "chrome/common/extensions/mime_types_handler.h"
 #include "chrome/common/extensions/web_accessible_resources_handler.h"
 #include "chrome/common/extensions/webview_handler.h"
-#include "extensions/common/manifest_handlers/background_info.h"
-#include "extensions/common/manifest_handlers/csp_info.h"
-#include "extensions/common/manifest_handlers/incognito_info.h"
-#include "extensions/common/manifest_handlers/kiosk_mode_info.h"
-#include "extensions/common/manifest_handlers/offline_enabled_info.h"
 #include "extensions/common/manifest_handlers/requirements_info.h"
-#include "extensions/common/manifest_handlers/sandboxed_page_info.h"
-#include "extensions/common/manifest_handlers/shared_module_info.h"
 
 namespace extensions {
 
 void RegisterChromeManifestHandlers() {
-  // This can happen in unit tests, where the utility thread runs in-process.
-  if (ManifestHandler::IsRegistrationFinalized())
-    return;
+  DCHECK(!ManifestHandler::IsRegistrationFinalized());
 #if defined(ENABLE_EXTENSIONS)
   (new AppIsolationHandler)->Register();
   (new AppLaunchManifestHandler)->Register();
-  (new BackgroundManifestHandler)->Register();
   (new BrowserActionHandler)->Register();
   (new CommandsHandler)->Register();
   (new ContentScriptsHandler)->Register();
-  (new CSPHandler(false))->Register();
-  (new CSPHandler(true))->Register();
   (new DefaultLocaleHandler)->Register();
   (new DevToolsPageHandler)->Register();
   (new ExternallyConnectableHandler)->Register();
@@ -69,27 +57,22 @@ void RegisterChromeManifestHandlers() {
   (new FileHandlersParser)->Register();
   (new HomepageURLHandler)->Register();
   (new IconsHandler)->Register();
-  (new IncognitoHandler)->Register();
 #if defined(OS_CHROMEOS)
   (new InputComponentsHandler)->Register();
 #endif
-  (new KioskModeHandler)->Register();
   (new ManagedModeHandler)->Register();
   (new MediaGalleriesHandlerParser)->Register();
   (new MimeTypesHandlerParser)->Register();
   (new MinimumChromeVersionChecker)->Register();
   (new NaClModulesHandler)->Register();
   (new OAuth2ManifestHandler)->Register();
-  (new OfflineEnabledHandler)->Register();
   (new OmniboxHandler)->Register();
   (new OptionsPageHandler)->Register();
   (new PageActionHandler)->Register();
   (new PluginsHandler)->Register();
-  (new RequirementsHandler)->Register();
-  (new SandboxedPageHandler)->Register();
+  (new RequirementsHandler)->Register();  // Depends on plugins.
   (new SettingsOverridesHandler)->Register();
   (new ScriptBadgeHandler)->Register();
-  (new SharedModuleHandler)->Register();
   (new SocketsManifestHandler)->Register();
   (new SpellcheckHandler)->Register();
   (new StorageSchemaManifestHandler)->Register();
@@ -101,7 +84,6 @@ void RegisterChromeManifestHandlers() {
   (new URLOverridesHandler)->Register();
   (new WebAccessibleResourcesHandler)->Register();
   (new WebviewHandler)->Register();
-  ManifestHandler::FinalizeRegistration();
 #endif
 }