Merge 69380 - Don't show duplicate Autofill suggestions....

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2010 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/autofill/autofill_manager.h"
 
 #include <limits>
-#include <string>
+#include <set>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/autofill/select_control_handler.h"
@@ skipping 15 matching lines @@
 namespace {
 
 // We only send a fraction of the forms to upload server.
 // The rate for positive/negative matches potentially could be different.
 const double kAutoFillPositiveUploadRateDefaultValue = 0.01;
 const double kAutoFillNegativeUploadRateDefaultValue = 0.01;
 
 const string16::value_type kCreditCardPrefix[] = {'*',0};
 const string16::value_type kLabelSeparator[] = {';',' ','*',0};
 
-// Removes duplicate elements whilst preserving original order of |elements| and
-// |unique_ids|.
-void RemoveDuplicateElements(
-    std::vector<string16>* elements, std::vector<int>* unique_ids) {
-  DCHECK_EQ(elements->size(), unique_ids->size());
+// Removes duplicate suggestions whilst preserving their original order.
+void RemoveDuplicateSuggestions(std::vector<string16>* values,
+                                std::vector<string16>* labels,
+                                std::vector<string16>* icons,
+                                std::vector<int>* unique_ids) {
+  DCHECK_EQ(values->size(), labels->size());
+  DCHECK_EQ(values->size(), icons->size());
+  DCHECK_EQ(values->size(), unique_ids->size());
 
-  std::vector<string16> elements_copy;
+  std::set<std::pair<string16, string16> > seen_suggestions;
+  std::vector<string16> values_copy;
+  std::vector<string16> labels_copy;
+  std::vector<string16> icons_copy;
   std::vector<int> unique_ids_copy;
-  for (size_t i = 0; i < elements->size(); ++i) {
-    const string16& element = (*elements)[i];
 
-    bool unique = true;
-    for (std::vector<string16>::const_iterator copy_iter
-             = elements_copy.begin();
-         copy_iter != elements_copy.end(); ++copy_iter) {
-      if (element == *copy_iter) {
-        unique = false;
-        break;
-      }
-    }
-
-    if (unique) {
-      elements_copy.push_back(element);
+  for (size_t i = 0; i < values->size(); ++i) {
+    const std::pair<string16, string16> suggestion((*values)[i], (*labels)[i]);
+    if (seen_suggestions.insert(suggestion).second) {
+      values_copy.push_back((*values)[i]);
+      labels_copy.push_back((*labels)[i]);
+      icons_copy.push_back((*icons)[i]);
       unique_ids_copy.push_back((*unique_ids)[i]);
     }
   }
 
-  elements->assign(elements_copy.begin(), elements_copy.end());
-  unique_ids->assign(unique_ids_copy.begin(), unique_ids_copy.end());
+  values->swap(values_copy);
+  labels->swap(labels_copy);
+  icons->swap(icons_copy);
+  unique_ids->swap(unique_ids_copy);
 }
 
 // Precondition: |form_structure| and |form| should correspond to the same
 // logical form. Returns true if the relevant portion of |form| is auto-filled.
 // If |is_filling_credit_card|, the relevant portion is the credit card portion;
 // otherwise it is the address and contact info portion.
 bool FormIsAutoFilled(const FormStructure* form_structure,
                       const webkit_glue::FormData& form,
                       bool is_filling_credit_card) {
   // TODO(isherman): It would be nice to share most of this code with the loop
@@ skipping 161 matching lines @@
     values.assign(1, l10n_util::GetStringUTF16(warning));
     labels.assign(1, string16());
     icons.assign(1, string16());
     unique_ids.assign(1, -1);
     host->AutoFillSuggestionsReturned(values, labels, icons, unique_ids);
     return true;
   }
 
   // If the form is auto-filled and the renderer is querying for suggestions,
   // then the user is editing the value of a field. In this case, mimick
-  // autocomplete. In particular, don't display labels, as that information is
-  // redundant. In addition, remove duplicate values.
+  // autocomplete: don't display or icons, as that information is redundant.
   if (FormIsAutoFilled(form_structure, form, is_filling_credit_card)) {
-    RemoveDuplicateElements(&values, &unique_ids);
-    labels.assign(values.size(), string16());
-    icons.assign(values.size(), string16());
+    labels.assign(labels.size(), string16());
+    icons.assign(icons.size(), string16());
   }
 
+  RemoveDuplicateSuggestions(&values, &labels, &icons, &unique_ids);
   host->AutoFillSuggestionsReturned(values, labels, icons, unique_ids);
   return true;
 }
 
 bool AutoFillManager::FillAutoFillFormData(int query_id,
                                            const FormData& form,
                                            const FormField& field,
                                            int unique_id) {
   const std::vector<AutoFillProfile*>& profiles = personal_data_->profiles();
   const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();
@@ skipping 498 matching lines @@
     return std::string();
 
   std::map<int, std::string>::const_iterator iter = id_guid_map_.find(id);
   if (iter == id_guid_map_.end()) {
     NOTREACHED();
     return std::string();
   }
 
   return iter->second;
 }