Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_service.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 39 matching lines @@
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_error_ui.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_preference_api.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
 #include "chrome/browser/extensions/external_provider_interface.h"
 #include "chrome/browser/extensions/installed_loader.h"
 #include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/platform_app_launcher.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
@@ skipping 55 matching lines @@
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::PluginService;
 using extensions::CrxInstaller;
 using extensions::Extension;
 using extensions::ExtensionIdSet;
 using extensions::ExtensionInfo;
+using extensions::ExtensionWarningService;
+using extensions::ExtensionWarning;
 using extensions::UnloadedExtensionInfo;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
 using extensions::PermissionSet;
 
 namespace errors = extension_manifest_errors;
 
 namespace {
 
 #if defined(OS_LINUX)
@@ skipping 185 matching lines @@
       show_extensions_prompts_(true),
       ready_(false),
       toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       menu_manager_(profile),
       app_notification_manager_(
           new extensions::AppNotificationManager(profile)),
       event_routers_initialized_(false),
       update_once_all_providers_are_ready_(false),
       app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      extension_warnings_(profile),
       app_shortcut_manager_(profile) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Figure out if extension installation should be enabled.
   if (command_line->HasSwitch(switches::kDisableExtensions)) {
     extensions_enabled_ = false;
   } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
     extensions_enabled_ = false;
   }
 
@@ skipping 451 matching lines @@
       base::FieldTrialList::TrialExists(kDefaultAppsTrialName);
   if (default_apps_trial_exists) {
     UMA_HISTOGRAM_ENUMERATION(
         base::FieldTrial::MakeName("Extensions.ExtensionUninstalled",
                                    kDefaultAppsTrialName),
         1, 2);
   }
 
   // Uninstalling one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
-  std::set<ExtensionWarningSet::WarningType> warnings;
-  extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
-  extension_warnings_.ClearWarnings(warnings);
+  std::set<ExtensionWarning::WarningType> warning_types;

[battre, 2012/09/11 21:56:41]

I will move this into the if statement.

[battre, 2012/09/20 14:23:07]

Done.

+  ExtensionWarningService* warning_service = system_->warning_service();
+  if (warning_service) {  // May be NULL for unit tests.
+    warning_service->GetWarningTypesAffectingExtension(extension_id,
+                                                       &warning_types);

[Aaron Boodman, 2012/09/18 18:48:56]

Why not put this in UNLOAD rather than duplicating it for DISABLE and UNINSTALL.

Also, can you set up WarningService to listen to notifications from
ExtensionService, rather than having the code in here?

[battre, 2012/09/20 14:23:07]

Done.

+    warning_service->ClearWarnings(warning_types);
+  }
 
   return true;
 }
 
 bool ExtensionService::IsExtensionEnabled(
     const std::string& extension_id) const {
   if (extensions_.Contains(extension_id) ||
       terminated_extensions_.Contains(extension_id)) {
     return true;
   }
@@ skipping 79 matching lines @@
     extensions_.Remove(extension->id());
     NotifyExtensionUnloaded(extension, extension_misc::UNLOAD_REASON_DISABLE);
   } else {
     terminated_extensions_.Remove(extension->id());
   }
 
   SyncExtensionChangeIfNeeded(*extension);
 
   // Deactivating one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
-  std::set<ExtensionWarningSet::WarningType> warnings;
-  extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
-  extension_warnings_.ClearWarnings(warnings);
+  std::set<ExtensionWarning::WarningType> warning_types;
+  ExtensionWarningService* warning_service = system_->warning_service();
+  if (warning_service) {  // May be NULL for unit tests.
+    warning_service->GetWarningTypesAffectingExtension(extension_id,
+                                                       &warning_types);
+    warning_service->ClearWarnings(warning_types);
+  }
 }
 
 void ExtensionService::GrantPermissionsAndEnableExtension(
     const Extension* extension, bool record_oauth2_grant) {
   GrantPermissions(extension, record_oauth2_grant);
   RecordPermissionMessagesHistogram(
       extension, "Extensions.Permissions_ReEnable");
   extension_prefs_->SetDidExtensionEscalatePermissions(extension, false);
   EnableExtension(extension->id());
 }
@@ skipping 1698 matching lines @@
     extensions::ExtensionHost* extension_host) {
   if (!extension_host)
     return;
 
 #if !defined(OS_ANDROID)
   extensions::LaunchPlatformApp(extension_host->profile(),
                                 extension_host->extension(),
                                 NULL, FilePath());
 #endif
 }