[Autofill] Support "importing" verified profiles and credit cards.

components/autofill/browser/personal_data_manager.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 "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 707 matching lines @@
   base::string16 zip = profile.GetRawInfo(ADDRESS_HOME_ZIP);
   if (profile.GetRawInfo(ADDRESS_HOME_COUNTRY) == ASCIIToUTF16("US") &&
       !zip.empty() && !autofill::IsValidZip(zip))
     return false;
 
   return true;
 }
 
 // static
 bool PersonalDataManager::MergeProfile(
-    const AutofillProfile& profile,
+    const AutofillProfile& new_profile,
     const std::vector<AutofillProfile*>& existing_profiles,
     const std::string& app_locale,
     std::vector<AutofillProfile>* merged_profiles) {
   merged_profiles->clear();
 
   // Set to true if |profile| is merged into |existing_profiles|.
   bool merged = false;
 
   // If we have already saved this address, merge in any missing values.
   // Only merge with the first match.
   for (std::vector<AutofillProfile*>::const_iterator iter =
            existing_profiles.begin();
        iter != existing_profiles.end(); ++iter) {
-    if (!merged) {
-      if (!profile.PrimaryValue().empty() &&
-          StringToLowerASCII((*iter)->PrimaryValue()) ==
-              StringToLowerASCII(profile.PrimaryValue())) {
+    AutofillProfile* existing_profile = *iter;
+    if (!merged &&
+        !new_profile.PrimaryValue().empty() &&
+        StringToLowerASCII(existing_profile->PrimaryValue()) ==
+            StringToLowerASCII(new_profile.PrimaryValue())) {
+      if (!existing_profile->IsVerified()) {
+        (*iter)->OverwriteWithOrAddTo(new_profile, app_locale);
         merged = true;
-
+      } else if (!new_profile.IsVerified()) {
         // Automatically aggregated profiles should never overwrite explicitly
         // user-entered ones.  If one would, just drop it.
-        DCHECK(!profile.IsVerified());
-        if (!(*iter)->IsVerified())
-          (*iter)->OverwriteWithOrAddTo(profile, app_locale);
+        merged = true;

[Evan Stade, 2013/06/12 20:40:17]

nit: merged = true is a little confusing here, since you didn't actually merge
it (you dropped it).

[Evan Stade, 2013/06/12 20:40:17]

So if the old profile is verified, and the new profile is verified, you will get
2 copies of the same thing? Seems like it should be

if (old_is_verified && !new_is_verified)
  drop it
else
  merge it

[Ilya Sherman, 2013/06/13 05:41:37]

Is it better now with "merged = true;" outside of the if-else ladder, and with
the expanded comment?  If not, do you have any suggestions on how to make this
clearer?

[Ilya Sherman, 2013/06/13 05:41:37]

Done.

[Evan Stade, 2013/06/13 17:48:29]

my suggestion would be:

// Set to true if |existing_profiles| already contains an equivalent profile.
bool matching_profile_found = false;

[Ilya Sherman, 2013/06/14 23:58:25]

Done.

       }
     }
     merged_profiles->push_back(**iter);
   }
 
   // If the new profile was not merged with an existing one, add it to the list.
   if (!merged)
-    merged_profiles->push_back(profile);
+    merged_profiles->push_back(new_profile);
 
   return merged;
 }
 
 void PersonalDataManager::SetProfiles(std::vector<AutofillProfile>* profiles) {
   if (browser_context_->IsOffTheRecord())
     return;
 
   // Remove empty profiles from input.
   for (std::vector<AutofillProfile>::iterator it = profiles->begin();
@@ skipping 251 matching lines @@
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }
 
 }  // namespace autofill