Improve error messaging of webRequest API in case of conflicts

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/api/prefs/pref_change_registrar.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
-#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 
 class ExtensionService;
 class FilePath;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace extensions {
 class Extension;
 class ExtensionHost;
+class ExtensionWarningService;
 class ManagementPolicy;
 }
 
 // Information about a page running in an extension, for example a popup bubble,
 // a background page, or a tab contents.
 struct ExtensionPage {
   ExtensionPage(const GURL& url, int render_process_id, int render_view_id,
                 bool incognito)
       : url(url),
         render_process_id(render_process_id),
@@ skipping 16 matching lines @@
   virtual ~ExtensionSettingsHandler();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Extension Detail JSON Struct for page. |pages| is injected for unit
   // testing.
   // Note: |warning_set| can be NULL in unit tests.
   base::DictionaryValue* CreateExtensionDetailValue(
       const extensions::Extension* extension,
       const std::vector<ExtensionPage>& pages,
-      const ExtensionWarningSet* warning_set);
+      const extensions::ExtensionWarningService* warning_set);
 
   void GetLocalizedValues(base::DictionaryValue* localized_strings);
 
   // content::WebContentsObserver implementation, which reloads all unpacked
   // extensions whenever chrome://extensions is reloaded.
   virtual void NavigateToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) OVERRIDE;
 
  private:
@@ skipping 128 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   PrefChangeRegistrar pref_registrar_;
   PrefChangeRegistrar local_state_pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_