Move permission warning message handling from PermissionSet to PermissionMessageProvider.

chrome/common/extensions/chrome_extensions_client.cc

Index: chrome/common/extensions/chrome_extensions_client.cc
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index fbebb8c324a894ac3271b7cdd2cb31582ae32c0d..29dd4dbfaf7285c170785e2e0a569ce4cc2bbb8c 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -6,6 +6,8 @@
 
 #include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/features/base_feature_provider.h"
+#include "chrome/common/extensions/permissions/app_permission_message_provider.h"
+#include "chrome/common/extensions/permissions/extension_permission_message_provider.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/permissions/permission_message.h"
@@ -26,6 +28,22 @@ ChromeExtensionsClient::ChromeExtensionsClient()
 ChromeExtensionsClient::~ChromeExtensionsClient() {
 }
 
+void ChromeExtensionsClient::Initialize() {
+  RegisterChromeManifestHandlers();
+
+  ExtensionPermissionMessageProvider* extension_permission_message_provider =
+      new ExtensionPermissionMessageProvider;
+  AppPermissionMessageProvider* app_permission_message_provider =
+      new AppPermissionMessageProvider;
+  std::vector<std::pair<Manifest::Type, PermissionMessageProvider*> >
+      custom_providers;
+  custom_providers.push_back(std::make_pair(
+      Manifest::TYPE_PLATFORM_APP,
+      app_permission_message_provider));
+  PermissionMessageProvider::SetProviders(extension_permission_message_provider,
+                                          custom_providers);
+}
+
 const PermissionsProvider&
 ChromeExtensionsClient::GetPermissionsProvider() const {
   return chrome_api_permissions_;
@@ -36,10 +54,6 @@ FeatureProvider* ChromeExtensionsClient::GetFeatureProviderByName(
   return BaseFeatureProvider::GetByName(name);
 }
 
-void ChromeExtensionsClient::RegisterManifestHandlers() const {
-  RegisterChromeManifestHandlers();
-}
-
 void ChromeExtensionsClient::FilterHostPermissions(
     const URLPatternSet& hosts,
     URLPatternSet* new_hosts,