Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_system.h

Index: chrome/browser/extensions/extension_system.h
diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h
index 93cec349945303769fb860f751c04081e95975fd..b65935bb8f7c5bbc772aed7bc7fce56eea695b3f 100644
--- a/chrome/browser/extensions/extension_system.h
+++ b/chrome/browser/extensions/extension_system.h
@@ -30,6 +30,8 @@ class EventRouter;
 class Extension;
 class ExtensionPrefs;
 class ExtensionSystemSharedFactory;
+class ExtensionWarningSet;
+class ExtensionWarningBadgeService;
 class LazyBackgroundTaskQueue;
 class ManagementPolicy;
 class MessageService;
@@ -116,6 +118,9 @@ class ExtensionSystem : public ProfileKeyedService {
   virtual ApiResourceManager<UsbDeviceResource>*
   usb_device_resource_manager() = 0;
 
+  // The ExtensionWarningSet is created at startup.
+  virtual ExtensionWarningSet* warning_set() = 0;
+
   // Called by the ExtensionService that lives in this system. Gives the
   // info map a chance to react to the load event before the EXTENSION_LOADED
   // notification has fired. The purpose for handling this event first is to
@@ -168,6 +173,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual ApiResourceManager<Socket>* socket_manager() OVERRIDE;
   virtual ApiResourceManager<UsbDeviceResource>* usb_device_resource_manager()
       OVERRIDE;
+  virtual ExtensionWarningSet* warning_set() OVERRIDE;
 
   virtual void RegisterExtensionWithRequestContexts(
       const Extension* extension) OVERRIDE;
@@ -244,6 +250,8 @@ class ExtensionSystemImpl : public ExtensionSystem {
                UsbDeviceResource> > usb_device_resource_manager_;
   scoped_ptr<RulesRegistryService> rules_registry_service_;
 
+  scoped_ptr<ExtensionWarningSet> extension_warning_set_;
+  scoped_ptr<ExtensionWarningBadgeService> extension_warning_badge_service_;
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };