Improve error messaging of webRequest API in case of conflicts

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 163ffdf3b8cf918fd8e800834fb2462fbebc9f75..31827afc543742d0e2dea70a56cc12ca6860afa3 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -106,7 +106,7 @@ void ExtensionSettingsHandler::RegisterUserPrefs(PrefService* prefs) {
 DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
     const Extension* extension,
     const std::vector<ExtensionPage>& pages,
-    const ExtensionWarningSet* warnings_set) {
+    const ExtensionWarningService* warnings_set) {
   DictionaryValue* extension_data = new DictionaryValue();
   bool enabled = extension_service_->IsExtensionEnabled(extension->id());
   extension->GetBasicInfo(enabled, extension_data);
@@ -175,18 +175,17 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
 
   // Add warnings.
   if (warnings_set) {
-    std::set<ExtensionWarningSet::WarningType> warnings;
+    std::set<linked_ptr<ExtensionWarning> > warnings;
     warnings_set->GetWarningsAffectingExtension(extension->id(), &warnings);
 
     if (!warnings.empty()) {
       ListValue* warnings_list = new ListValue;
-      for (std::set<ExtensionWarningSet::WarningType>::const_iterator iter =
+      for (std::set<linked_ptr<ExtensionWarning> >::const_iterator iter =
                warnings.begin();
            iter != warnings.end();
            ++iter) {
-        string16 warning_string(
-            ExtensionWarningSet::GetLocalizedWarning(*iter));
-        warnings_list->Append(Value::CreateStringValue(warning_string));
+        warnings_list->Append(
+            Value::CreateStringValue((*iter)->GetMessage(extension_service_)));
       }
       extension_data->Set("warnings", warnings_list);
     }
@@ -474,7 +473,7 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
   // Add the extensions to the results structure.
   ListValue *extensions_list = new ListValue();
 
-  ExtensionWarningSet* warnings = extension_service_->extension_warnings();
+  ExtensionWarningService* warnings = extension_service_->extension_warnings();
 
   const ExtensionSet* extensions = extension_service_->extensions();
   for (ExtensionSet::const_iterator extension = extensions->begin();