Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_service.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/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 791 matching lines @@
       base::FieldTrialList::TrialExists(kDefaultAppsTrialName);
   if (default_apps_trial_exists) {
     UMA_HISTOGRAM_ENUMERATION(
         base::FieldTrial::MakeName("Extensions.ExtensionUninstalled",
                                    kDefaultAppsTrialName),
         1, 2);
   }
 
   // Uninstalling one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
-  std::set<ExtensionWarningSet::WarningType> warnings;
-  extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
-  extension_warnings_.ClearWarnings(warnings);
+  std::set<ExtensionWarning::WarningType> warning_types;
+  extension_warnings_.GetWarningTypesAffectingExtension(extension_id,
+                                                        &warning_types);
+  extension_warnings_.ClearWarnings(warning_types);
 
   return true;
 }
 
 bool ExtensionService::IsExtensionEnabled(
     const std::string& extension_id) const {
   if (extensions_.Contains(extension_id) ||
       terminated_extensions_.Contains(extension_id)) {
     return true;
   }
@@ skipping 78 matching lines @@
     extensions_.Remove(extension->id());
   else
     terminated_extensions_.Remove(extension->id());
 
   NotifyExtensionUnloaded(extension, extension_misc::UNLOAD_REASON_DISABLE);
 
   SyncExtensionChangeIfNeeded(*extension);
 
   // Deactivating one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
-  std::set<ExtensionWarningSet::WarningType> warnings;
-  extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
-  extension_warnings_.ClearWarnings(warnings);
+  std::set<ExtensionWarning::WarningType> warning_types;
+  extension_warnings_.GetWarningTypesAffectingExtension(extension_id,
+                                                        &warning_types);
+  extension_warnings_.ClearWarnings(warning_types);
 }
 
 void ExtensionService::GrantPermissionsAndEnableExtension(
     const Extension* extension, bool record_oauth2_grant) {
   GrantPermissions(extension, record_oauth2_grant);
   RecordPermissionMessagesHistogram(
       extension, "Extensions.Permissions_ReEnable");
   extension_prefs_->SetDidExtensionEscalatePermissions(extension, false);
   EnableExtension(extension->id());
 }
@@ skipping 1698 matching lines @@
     extensions::ExtensionHost* extension_host) {
   if (!extension_host)
     return;
 
 #if !defined(OS_ANDROID)
   extensions::LaunchPlatformApp(extension_host->profile(),
                                 extension_host->extension(),
                                 NULL, FilePath());
 #endif
 }