Consolidate manifest handler registration.

chrome/utility/chrome_content_utility_client.cc

Index: chrome/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 18e2dec22747913b11e4692c558094dba37f4a80..37f3836fcc2540a95c7cbd2230f2825dcf77a4a8 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -17,17 +17,10 @@
 #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"
@@ -53,22 +46,6 @@
 #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() {
@@ -146,10 +123,9 @@ void ChromeContentUtilityClient::OnUnpackExtension(
     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,