Don't save duplicates of wallet addresses to local Autofill.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 1105 matching lines @@
 void PersonalDataManager::LoadProfiles() {
   if (!database_.get()) {
     NOTREACHED();
     return;
   }
 
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_server_profiles_query_);
 
   pending_profiles_query_ = database_->GetAutofillProfiles(this);
-  pending_server_profiles_query_ = database_->GetAutofillServerProfiles(this);
+  pending_server_profiles_query_ = database_->GetServerProfiles(this);
 }
 
 // Win, Linux, Android and iOS implementations do nothing. Mac implementation
 // fills in the contents of |auxiliary_profiles_|.
 #if defined(OS_IOS) || !defined(OS_MACOSX)
 void PersonalDataManager::LoadAuxiliaryProfiles(bool record_metrics) const {
 }
 #endif
 
 void PersonalDataManager::LoadCreditCards() {
@@ skipping 20 matching lines @@
   }
   *handle = 0;
 }
 
 std::string PersonalDataManager::SaveImportedProfile(
     const AutofillProfile& imported_profile) {
   if (is_off_the_record_)
     return std::string();
 
   // Don't save a web profile if the data in the profile is a subset of an
-  // auxiliary profile.
-  for (std::vector<AutofillProfile*>::const_iterator iter =
-           auxiliary_profiles_.begin();
-       iter != auxiliary_profiles_.end(); ++iter) {
-    if (imported_profile.IsSubsetOf(**iter, app_locale_))
-      return (*iter)->guid();
+  // auxiliary profile...
+  for (AutofillProfile* profile : auxiliary_profiles_) {
+    if (imported_profile.IsSubsetOf(*profile, app_locale_))
+      return profile->guid();
+  }
+
+  // ...or server profile.
+  for (AutofillProfile* profile : server_profiles_) {
+    if (imported_profile.IsSubsetOf(*profile, app_locale_))
+      return profile->guid();
   }
 
   std::vector<AutofillProfile> profiles;
   std::string guid =
       MergeProfile(imported_profile, web_profiles_.get(), app_locale_,
                    &profiles);
   SetProfiles(&profiles);
   return guid;
 }
 
@@ skipping 96 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill