Improve error messaging of webRequest API in case of conflicts

chrome/chrome_browser_extensions.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_extensions',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 421 matching lines @@
         'browser/extensions/extension_error_ui_default.cc',
         'browser/extensions/extension_error_ui_default.h',
         'browser/extensions/extension_function.cc',
         'browser/extensions/extension_function.h',
         'browser/extensions/extension_function_dispatcher.cc',
         'browser/extensions/extension_function_dispatcher.h',
         'browser/extensions/extension_function_registry.cc',
         'browser/extensions/extension_function_registry.h',
         'browser/extensions/extension_function_util.cc',
         'browser/extensions/extension_function_util.h',
-        'browser/extensions/extension_global_error_badge.cc',
-        'browser/extensions/extension_global_error_badge.h',
         'browser/extensions/extension_host.cc',
         'browser/extensions/extension_host.h',
         'browser/extensions/extension_host_mac.h',
         'browser/extensions/extension_host_mac.mm',
         'browser/extensions/extension_icon_image.cc',
         'browser/extensions/extension_icon_image.h',
         'browser/extensions/extension_icon_manager.cc',
         'browser/extensions/extension_icon_manager.h',
         'browser/extensions/extension_info_map.cc',
         'browser/extensions/extension_info_map.h',
@@ skipping 42 matching lines @@
         'browser/extensions/extension_sync_data.cc',
         'browser/extensions/extension_sync_data.h',
         'browser/extensions/extension_tab_id_map.cc',
         'browser/extensions/extension_tab_id_map.h',
         'browser/extensions/extension_tab_util.cc',
         'browser/extensions/extension_tab_util.h',
         'browser/extensions/extension_toolbar_model.cc',
         'browser/extensions/extension_toolbar_model.h',
         'browser/extensions/extension_uninstall_dialog.cc',
         'browser/extensions/extension_uninstall_dialog.h',
+        'browser/extensions/extension_warning_badge_service.cc',
+        'browser/extensions/extension_warning_badge_service.h',
+        'browser/extensions/extension_warning_service.cc',
+        'browser/extensions/extension_warning_service.h',
         'browser/extensions/extension_warning_set.cc',
         'browser/extensions/extension_warning_set.h',
         'browser/extensions/extension_web_ui.cc',
         'browser/extensions/extension_web_ui.h',
         'browser/extensions/extension_webkit_preferences.cc',
         'browser/extensions/extension_webkit_preferences.h',
         'browser/extensions/extensions_quota_service.cc',
         'browser/extensions/extensions_quota_service.h',
         'browser/extensions/external_install_ui.cc',
         'browser/extensions/external_install_ui.h',
@@ skipping 362 matching lines @@
             'browser/extensions/app_host/update.cc',
             'browser/extensions/app_host/update.h',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/app_host_exe_version.rc',
           ],
         },
       ],
     }, ],  # 'OS=="win"'
   ],  # 'conditions'
 }