Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_warning_set.cc

Index: chrome/browser/extensions/extension_warning_set.cc
diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc
index 2d73cd684c4b3ea58c9a276ba879757399b98583..5f06b62d43560881c7d026f4d7e36e652faae853 100644
--- a/chrome/browser/extensions/extension_warning_set.cc
+++ b/chrome/browser/extensions/extension_warning_set.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/extensions/extension_warning_set.h"
 
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_global_error_badge.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -12,107 +13,237 @@
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
-// This class is used to represent warnings if extensions misbehave.
-class ExtensionWarning {
- public:
-  // Default constructor for storing ExtensionServiceWarning in STL containers
-  // do not use.
-  ExtensionWarning();
+namespace {
+// Prefix for message parameters indicating that the parameter needs to
+// be translated from an extension id to the extension name.
+const char kTranslate[] = "TO_TRANSLATE:";
+const size_t kMaxNumberOfParameters = 4;
+}
 
-  // Constructs a warning of type |type| for extension |extension_id|. This
-  // could be for example the fact that an extension conflicted with others.
-  ExtensionWarning(ExtensionWarningSet::WarningType type,
-                   const std::string& extension_id);
+//
+// ExtensionWarning
+//
 
-  ~ExtensionWarning();
+ExtensionWarning::ExtensionWarning(
+    WarningType type,
+    const std::string& extension_id,
+    int message_id,
+    const std::vector<std::string>& message_parameters)
+    : type_(type),
+      extension_id_(extension_id),
+      message_id_(message_id),
+      message_parameters_(message_parameters) {
+  // These are invalid here because they do not have corresponding warning
+  // messages in the UI.
+  CHECK_NE(type, kInvalid);
+  CHECK_NE(type, kMaxWarningType);
+  CHECK_LE(message_parameters.size(), kMaxNumberOfParameters);
+}
 
-  // Returns the specific warning type.
-  ExtensionWarningSet::WarningType warning_type() const { return type_; }
+ExtensionWarning::~ExtensionWarning() {
+}
 
-  // Returns the id of the extension for which this warning is valid.
-  const std::string& extension_id() const { return extension_id_; }
+// static
+scoped_ptr<ExtensionWarning> ExtensionWarning::CreateNetworkDelayWarning(
+    const std::string& extension_id) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kNetworkDelay,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_NETWORK_DELAY,
+          message_parameters));
+}
 
- private:
-  ExtensionWarningSet::WarningType type_;
-  std::string extension_id_;
+// static
+scoped_ptr<ExtensionWarning> ExtensionWarning::CreateNetworkConflictWarning(
+    const std::string& extension_id) {
+  std::vector<std::string> message_parameters;
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kNetworkConflict,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT,
+          message_parameters));
+}
 
-  // Allow implicit copy and assign operator.
-};
+// static
+scoped_ptr<ExtensionWarning> ExtensionWarning::CreateRedirectConflictWarning(
+    const std::string& extension_id,
+    const std::string& winning_extension_id,
+    const GURL& attempted_redirect_url,
+    const GURL& winning_redirect_url) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(attempted_redirect_url.spec());
+  message_parameters.push_back(kTranslate + winning_extension_id);
+  message_parameters.push_back(winning_redirect_url.spec());
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kRedirectConflict,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_REDIRECT_CONFLICT,
+          message_parameters));
+}
 
-ExtensionWarning::ExtensionWarning() : type_(ExtensionWarningSet::kInvalid) {
+// static
+scoped_ptr<ExtensionWarning>
+ExtensionWarning::CreateRequestHeaderConflictWarning(
+    const std::string& extension_id,
+    const std::string& winning_extension_id,
+    const std::string& conflicting_header) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(conflicting_header);
+  message_parameters.push_back(kTranslate + winning_extension_id);
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kNetworkConflict,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_REQUEST_HEADER_CONFLICT,
+          message_parameters));
 }
 
-ExtensionWarning::ExtensionWarning(
-    ExtensionWarningSet::WarningType type,
-    const std::string& extension_id)
-    : type_(type), extension_id_(extension_id) {
-  // These are invalid here because they do not have corresponding warning
-  // messages in the UI.
-  CHECK(type != ExtensionWarningSet::kInvalid);
-  CHECK(type != ExtensionWarningSet::kMaxWarningType);
+// static
+scoped_ptr<ExtensionWarning>
+ExtensionWarning::CreateResponseHeaderConflictWarning(
+    const std::string& extension_id,
+    const std::string& winning_extension_id,
+    const std::string& conflicting_header) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(conflicting_header);
+  message_parameters.push_back(kTranslate + winning_extension_id);
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kNetworkConflict,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_RESPONSE_HEADER_CONFLICT,
+          message_parameters));
 }
 
-ExtensionWarning::~ExtensionWarning() {
+// static
+scoped_ptr<ExtensionWarning> ExtensionWarning::CreateCredentialsConflictWarning(
+    const std::string& extension_id,
+    const std::string& winning_extension_id) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(kTranslate + winning_extension_id);
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kNetworkConflict,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_CREDENTIALS_CONFLICT,
+          message_parameters));
 }
 
-bool operator<(const ExtensionWarning& a, const ExtensionWarning& b) {
-  if (a.warning_type() == b.warning_type())
-    return a.extension_id() < b.extension_id();
-  return a.warning_type() < b.warning_type();
+// static
+scoped_ptr<ExtensionWarning>
+ExtensionWarning::CreateRepeatedCacheFlushesWarning(
+    const std::string& extension_id) {
+  std::vector<std::string> message_parameters;
+  message_parameters.push_back(l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
+  return make_scoped_ptr(
+      new ExtensionWarning(
+          kRepeatedCacheFlushes,
+          extension_id,
+          IDS_EXTENSION_WARNINGS_NETWORK_DELAY,
+          message_parameters));
 }
 
-// Static
-string16 ExtensionWarningSet::GetLocalizedWarning(
-    ExtensionWarningSet::WarningType warning_type) {
-  switch (warning_type) {
-    case kInvalid:
-    case kMaxWarningType:
+const std::string ExtensionWarning::GetMessage(
+    ExtensionService* extension_service) const {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // These parameters may be unsafe (URLs and Extension names) and need
+  // to be HTML-escaped before being embedded in the UI. Also extension IDs
+  // are translated to full extension names.
+  std::vector<string16> final_parameters;
+  for (size_t i = 0; i < message_parameters_.size(); ++i) {
+    std::string message = message_parameters_[i];
+    if (StartsWithASCII(message, kTranslate, true)) {
+      std::string extension_name = message.substr(sizeof(kTranslate) - 1);
+      const extensions::Extension* extension =
+          extension_service->GetExtensionById(extension_name, true);
+      message = extension ? extension->name() : extension_name;
+    }
+    final_parameters.push_back(UTF8ToUTF16(net::EscapeForHTML(message)));
+  }
+
+  COMPILE_ASSERT(kMaxNumberOfParameters == 4u, YouNeedToAddMoreCaseStatements);
+  switch (final_parameters.size()) {
+    case 0:
+      return l10n_util::GetStringUTF8(message_id_);
+    case 1:
+      return l10n_util::GetStringFUTF8(message_id_, final_parameters[0]);
+    case 2:
+      return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
+          final_parameters[1]);
+    case 3:
+      return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
+          final_parameters[1], final_parameters[2]);
+    case 4:
+      return l10n_util::GetStringFUTF8(message_id_, final_parameters[0],
+          final_parameters[1], final_parameters[2], final_parameters[3]);
+    default:
       NOTREACHED();
-      return string16();
-    case kNetworkDelay:
-      return l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_WARNINGS_NETWORK_DELAY,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-    case kNetworkConflict:
-      return l10n_util::GetStringUTF16(IDS_EXTENSION_WARNINGS_NETWORK_CONFLICT);
-    case kRepeatedCacheFlushes:
-      return l10n_util::GetStringFUTF16(
-          IDS_EXTENSION_WARNINGS_NETWORK_DELAY,
-          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+      return std::string();
   }
-  NOTREACHED();  // Switch statement has no default branch.
-  return string16();
 }
 
-ExtensionWarningSet::ExtensionWarningSet(Profile* profile) : profile_(profile) {
+bool operator<(const linked_ptr<ExtensionWarning>& a,
+               const linked_ptr<ExtensionWarning>& b) {
+  if (a->extension_id() != b->extension_id())
+    return a->extension_id() < b->extension_id();
+  return a->warning_type() < b->warning_type();
 }
 
-ExtensionWarningSet::~ExtensionWarningSet() {
+//
+// ExtensionWarningSet
+//
+
+ExtensionWarningSet::ExtensionWarningSet() {}
+
+ExtensionWarningSet::~ExtensionWarningSet() {}
+
+void ExtensionWarningSet::Insert(scoped_ptr<ExtensionWarning> warning) {
+  warnings_.insert(make_linked_ptr(warning.release()));
 }
 
-void ExtensionWarningSet::SetWarning(ExtensionWarningSet::WarningType type,
-                                     const std::string& extension_id) {
-  ExtensionWarning warning(type, extension_id);
-  bool inserted = warnings_.insert(warning).second;
-  if (inserted) {
-    NotifyWarningsChanged();
-    UpdateWarningBadge();
-  }
+std::set<linked_ptr<ExtensionWarning> > ExtensionWarningSet::Release() {
+  std::set<linked_ptr<ExtensionWarning> > other;
+  warnings_.swap(other);
+  return other;
+}
+
+bool ExtensionWarningSet::IsEmpty() const {
+  return warnings_.empty();
 }
 
-void ExtensionWarningSet::ClearWarnings(
-    const std::set<ExtensionWarningSet::WarningType>& types) {
+ExtensionWarningService::ExtensionWarningService(Profile* profile)
+    : profile_(profile) {
+  DCHECK(CalledOnValidThread());
+}
+
+//
+// ExtensionWarningService
+//
+
+ExtensionWarningService::~ExtensionWarningService() {}
+
+void ExtensionWarningService::ClearWarnings(
+    const std::set<ExtensionWarning::WarningType>& types) {
+  DCHECK(CalledOnValidThread());
   bool deleted_anything = false;
   for (iterator i = warnings_.begin(); i != warnings_.end();) {
-    if (types.find(i->warning_type()) != types.end()) {
+    if (types.find((*i)->warning_type()) != types.end()) {
       deleted_anything = true;
       warnings_.erase(i++);
     } else {
@@ -126,22 +257,47 @@ void ExtensionWarningSet::ClearWarnings(
   }
 }
 
-void ExtensionWarningSet::GetWarningsAffectingExtension(
+void ExtensionWarningService::GetWarningTypesAffectingExtension(
     const std::string& extension_id,
-    std::set<ExtensionWarningSet::WarningType>* result) const {
+    std::set<ExtensionWarning::WarningType>* result) const {
+  DCHECK(CalledOnValidThread());
   result->clear();
   for (const_iterator i = warnings_.begin(); i != warnings_.end(); ++i) {
-    if (i->extension_id() == extension_id)
-      result->insert(i->warning_type());
+    if ((*i)->extension_id() == extension_id)
+      result->insert((*i)->warning_type());
+  }
+}
+
+void ExtensionWarningService::GetWarningsAffectingExtension(
+    const std::string& extension_id,
+    std::set<linked_ptr<ExtensionWarning> >* result) const {
+  DCHECK(CalledOnValidThread());
+  result->clear();
+  for (const_iterator i = warnings_.begin(); i != warnings_.end(); ++i) {
+    if ((*i)->extension_id() == extension_id)
+      result->insert(*i);
+  }
+}
+
+void ExtensionWarningService::AddWarnings(
+    scoped_ptr<ExtensionWarningSet> warnings) {
+  DCHECK(CalledOnValidThread());
+  size_t old_size = warnings_.size();
+
+  std::set<linked_ptr<ExtensionWarning> > warning_set = warnings->Release();
+  warnings_.insert(warning_set.begin(), warning_set.end());
+
+  if (old_size != warnings_.size()) {
+    NotifyWarningsChanged();
+    UpdateWarningBadge();
   }
 }
 
 // static
-void ExtensionWarningSet::NotifyWarningsOnUI(
+void ExtensionWarningService::NotifyWarningsOnUI(
     void* profile_id,
-    std::set<std::string> extension_ids,
-    WarningType warning_type) {
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    scoped_ptr<ExtensionWarningSet> warnings) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Profile* profile = reinterpret_cast<Profile*>(profile_id);
   if (!profile ||
       !g_browser_process->profile_manager() ||
@@ -149,28 +305,28 @@ void ExtensionWarningSet::NotifyWarningsOnUI(
     return;
   }
 
-  ExtensionWarningSet* warnings =
+  ExtensionWarningService* warning_service =
       profile->GetExtensionService()->extension_warnings();
 
-  for (std::set<std::string>::const_iterator i = extension_ids.begin();
-       i != extension_ids.end(); ++i) {
-    warnings->SetWarning(warning_type, *i);
-  }
+  warning_service->AddWarnings(warnings.Pass());
 }
 
-void ExtensionWarningSet::SuppressBadgeForCurrentWarnings() {
+void ExtensionWarningService::SuppressBadgeForCurrentWarnings() {
+  DCHECK(CalledOnValidThread());
   badge_suppressions_.insert(warnings_.begin(), warnings_.end());
   UpdateWarningBadge();
 }
 
-void ExtensionWarningSet::NotifyWarningsChanged() {
+void ExtensionWarningService::NotifyWarningsChanged() {
+  DCHECK(CalledOnValidThread());
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_WARNING_CHANGED,
       content::Source<Profile>(profile_),
       content::NotificationService::NoDetails());
 }
 
-void ExtensionWarningSet::UpdateWarningBadge() {
+void ExtensionWarningService::UpdateWarningBadge() {
+  DCHECK(CalledOnValidThread());
   // We need a badge if a warning exists that has not been suppressed.
   bool need_warning_badge = false;
   for (const_iterator i = warnings_.begin(); i != warnings_.end(); ++i) {
@@ -193,3 +349,4 @@ void ExtensionWarningSet::UpdateWarningBadge() {
     service->AddGlobalError(new ExtensionGlobalErrorBadge);
   }
 }
+