[rAc] Persist selection of newly added cards and addresses.

components/autofill/core/browser/webdata/autofill_table.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/webdata/autofill_table.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <set>
@@ skipping 2077 matching lines @@
     AddAutofillProfileNamesToProfile(db_, profile.get());
 
     // Get associated email info.
     AddAutofillProfileEmailsToProfile(db_, profile.get());
 
     // Get associated phone info.
     AddAutofillProfilePhonesToProfile(db_, profile.get());
 
     if (PersonalDataManager::IsValidLearnableProfile(*profile, app_locale_)) {
       std::vector<AutofillProfile> merged_profiles;
-      bool merged = PersonalDataManager::MergeProfile(
+      std::string merged_guid = PersonalDataManager::MergeProfile(
           *profile, accumulated_profiles_p, app_locale_, &merged_profiles);
 
       std::swap(accumulated_profiles, merged_profiles);
 
       accumulated_profiles_p.clear();
       accumulated_profiles_p.resize(accumulated_profiles.size());
       std::transform(accumulated_profiles.begin(),
                      accumulated_profiles.end(),
                      accumulated_profiles_p.begin(),
                      address_of<AutofillProfile>);
 
       // If the profile got merged trash the original.
-      if (merged)
+      if (merged_guid != profile->guid())
         AddAutofillGUIDToTrash(profile->guid());
-
     } else {
       // An invalid profile, so trash it.
       AddAutofillGUIDToTrash(profile->guid());
     }
   }  // endwhile
   if (!s.Succeeded())
     return false;
 
   // Drop the current profiles.
   if (!ClearAutofillProfiles())
@@ skipping 60 matching lines @@
   if (!db_->DoesColumnExist("credit_cards", "origin") &&
       !db_->Execute("ALTER TABLE credit_cards "
                     "ADD COLUMN origin VARCHAR DEFAULT ''")) {
       return false;
   }
 
   return transaction.Commit();
 }
 
 }  // namespace autofill