Consolidate manifest handler registration.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 87d01c420d10fb97cd4f10cd79f1b29bbfc41c85..3950ab677a003333fb977f8b850e31c8134f19e1 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -18,21 +18,13 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
-#include "chrome/common/extensions/api/extension_action/page_action_handler.h"
-#include "chrome/common/extensions/background_info.h"
-#include "chrome/common/extensions/csp_handler.h"
+#include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/extensions/incognito_handler.h"
-#include "chrome/common/extensions/manifest_handler.h"
-#include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
-#include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h"
-#include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
-#include "chrome/common/extensions/web_accessible_resources_handler.h"
 #include "chrome/common/external_ipc_fuzzer.h"
 #include "chrome/common/localized_error.h"
 #include "chrome/common/render_messages.h"
@@ -141,20 +133,6 @@ const char kAdViewTagName[] = "ADVIEW";
 
 chrome::ChromeContentRendererClient* g_current_client;
 
-// Explicitly register all extension ManifestHandlers needed to parse
-// fields used in the renderer.
-void RegisterExtensionManifestHandlers() {
-  (new extensions::AppIsolationHandler)->Register();
-  (new extensions::BackgroundManifestHandler)->Register();
-  (new extensions::CSPHandler(false))->Register();  // not platform app.
-  (new extensions::CSPHandler(true))->Register();  // platform app.
-  (new extensions::DevToolsPageHandler)->Register();
-  (new extensions::IncognitoHandler)->Register();
-  (new extensions::PageActionHandler)->Register();
-  (new extensions::SandboxedPageHandler)->Register();
-  (new extensions::WebAccessibleResourcesHandler)->Register();
-}
-
 static void AppendParams(const std::vector<string16>& additional_names,
                          const std::vector<string16>& additional_values,
                          WebVector<WebString>* existing_names,
@@ -333,10 +311,9 @@ void ChromeContentRendererClient::RenderThreadStarted() {
   WebSecurityPolicy::registerURLSchemeAsBypassingContentSecurityPolicy(
       extension_resource_scheme);
 
-  extensions::ChromeAPIPermissions permissions;
   extensions::PermissionsInfo::GetInstance()->InitializeWithDelegate(
-      permissions);
-  RegisterExtensionManifestHandlers();
+      extensions::ChromeAPIPermissions());
+  extensions::RegisterChromeManifestHandlers();
 }
 
 void ChromeContentRendererClient::RenderViewCreated(