Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_system.cc

Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index ecd6067f100c4f18f726c55be0bb1c3fc9cc793a..34395ca2a680ad0bcce8008aa6ceacdfac5827c5 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -23,6 +23,8 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
+#include "chrome/browser/extensions/extension_warning_set.h"
+#include "chrome/browser/extensions/extension_warning_badge_service.h"
 #include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/extensions/api/messaging/message_service.h"
@@ -264,6 +266,10 @@ ExtensionSystemImpl::~ExtensionSystemImpl() {
 
 void ExtensionSystemImpl::Shutdown() {
   extension_process_manager_.reset();
+  if (extension_warning_set_.get()) {  // NULL for OTRProfile.
+    extension_warning_set_->RemoveObserver(
+        extension_warning_badge_service_.get());
+  }
 }
 
 void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
@@ -293,6 +299,11 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
   rules_registry_service_.reset(new RulesRegistryService(profile_));
   rules_registry_service_->RegisterDefaultRulesRegistries();
 
+  extension_warning_set_.reset(new ExtensionWarningSet(profile_));
+  extension_warning_badge_service_.reset(
+      new ExtensionWarningBadgeService(profile_));
+  extension_warning_set_->AddObserver(extension_warning_badge_service_.get());
+
   shared_->Init(extensions_enabled);
 }
 
@@ -375,6 +386,10 @@ ExtensionSystemImpl::usb_device_resource_manager() {
   return usb_device_resource_manager_.get();
 }
 
+ExtensionWarningSet* ExtensionSystemImpl::warning_set() {
+  return extension_warning_set_.get();
+}
+
 void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
     const Extension* extension) {
   base::Time install_time;