Consolidate manifest handler registration.

chrome/utility/chrome_content_utility_client.cc

 // Copyright (c) 2012 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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_utility_messages.h"
-#include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
-#include "chrome/common/extensions/api/extension_action/page_action_handler.h"
-#include "chrome/common/extensions/api/i18n/default_locale_handler.h"
-#include "chrome/common/extensions/api/plugins/plugins_handler.h"
-#include "chrome/common/extensions/background_info.h"
+#include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
-#include "chrome/common/extensions/incognito_handler.h"
 #include "chrome/common/extensions/manifest.h"
-#include "chrome/common/extensions/manifest_handlers/icons_handler.h"
-#include "chrome/common/extensions/manifest_handlers/theme_handler.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "chrome/common/extensions/unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "chrome/utility/profile_import_handler.h"
 #include "components/zip/zip.h"
 #include "content/public/utility/utility_thread.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "base/path_service.h"
 #include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "content/public/common/content_switches.h"
 #include "printing/emf_win.h"
 #include "ui/gfx/gdi_util.h"
 #endif  // defined(OS_WIN)
 
-namespace {
-
-// Explicitly register all ManifestHandlers needed in the utility process.
-void RegisterExtensionManifestHandlers() {
-  (new extensions::BackgroundManifestHandler)->Register();
-  (new extensions::BrowserActionHandler)->Register();
-  (new extensions::DefaultLocaleHandler)->Register();
-  (new extensions::IconsHandler)->Register();
-  (new extensions::IncognitoHandler)->Register();
-  (new extensions::PageActionHandler)->Register();
-  (new extensions::PluginsHandler)->Register();
-  (new extensions::ThemeHandler)->Register();
-}
-
-}  // namespace
-
 namespace chrome {
 
 ChromeContentUtilityClient::ChromeContentUtilityClient() {
 #if !defined(OS_ANDROID)
   import_handler_.reset(new ProfileImportHandler());
 #endif
 }
 
 ChromeContentUtilityClient::~ChromeContentUtilityClient() {
 }
@@ skipping 57 matching lines @@
   return content::UtilityThread::Get()->Send(message);
 }
 
 void ChromeContentUtilityClient::OnUnpackExtension(
     const base::FilePath& extension_path,
     const std::string& extension_id,
     int location,
     int creation_flags) {
   CHECK(location > extensions::Manifest::INVALID_LOCATION);
   CHECK(location < extensions::Manifest::NUM_LOCATIONS);
-  extensions::ChromeAPIPermissions permissions;
   extensions::PermissionsInfo::GetInstance()->InitializeWithDelegate(
-      permissions);
-  RegisterExtensionManifestHandlers();
+      extensions::ChromeAPIPermissions());
+  extensions::RegisterChromeManifestHandlers();
   extensions::Unpacker unpacker(
       extension_path,
       extension_id,
       static_cast<extensions::Manifest::Location>(location),
       creation_flags);
   if (unpacker.Run() && unpacker.DumpImagesToFile() &&
       unpacker.DumpMessageCatalogsToFile()) {
     Send(new ChromeUtilityHostMsg_UnpackExtension_Succeeded(
         *unpacker.parsed_manifest()));
   } else {
@@ skipping 328 matching lines @@
     IPC::PlatformFileForTransit zip_file) {
   safe_browsing::zip_analyzer::Results results;
   safe_browsing::zip_analyzer::AnalyzeZipFile(
       IPC::PlatformFileForTransitToPlatformFile(zip_file), &results);
   Send(new ChromeUtilityHostMsg_AnalyzeZipFileForDownloadProtection_Finished(
       results));
   content::UtilityThread::Get()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome