Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_global_error_badge.cc

Index: chrome/browser/extensions/extension_global_error_badge.cc
diff --git a/chrome/browser/extensions/extension_global_error_badge.cc b/chrome/browser/extensions/extension_global_error_badge.cc
index 70f37653de9506501bd9a68f5edd0014284a8fcd..a4c55c53db36db942eef6fbb655498640eba1cd8 100644
--- a/chrome/browser/extensions/extension_global_error_badge.cc
+++ b/chrome/browser/extensions/extension_global_error_badge.cc
@@ -6,7 +6,8 @@
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -34,12 +35,12 @@ string16 ExtensionGlobalErrorBadge::MenuItemLabel() {
 }
 
 void ExtensionGlobalErrorBadge::ExecuteMenuItem(Browser* browser) {
-  ExtensionService* extension_service =
-      browser->profile()->GetExtensionService();
+  extensions::ExtensionWarningService* warning_service =
+    extensions::ExtensionSystem::Get(browser->profile())->warning_service();
 
   // Suppress all current warnings in the extension service from triggering
   // a badge on the wrench menu in the future of this session.
-  extension_service->extension_warnings()->SuppressBadgeForCurrentWarnings();
+  warning_service->SuppressBadgeForCurrentWarnings();
 
   chrome::ExecuteCommand(browser, IDC_MANAGE_EXTENSIONS);
 }