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

components/autofill/core/browser/personal_data_manager.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 61 matching lines @@
   virtual void RemoveObserver(PersonalDataManagerObserver* observer);
 
   // Scans the given |form| for importable Autofill data. If the form includes
   // sufficient address data, it is immediately imported. If the form includes
   // sufficient credit card data, it is stored into |credit_card|, so that we
   // can prompt the user whether to save this data.
   // Returns |true| if sufficient address or credit card data was found.
   bool ImportFormData(const FormStructure& form,
                       const CreditCard** credit_card);
 
-  // Saves |imported_profile| to the WebDB if it exists.
-  virtual void SaveImportedProfile(const AutofillProfile& imported_profile);
+  // Saves |imported_profile| to the WebDB if it exists. Returns the guid of
+  // the new or updated profile, or the empty string if no profile was saved.
+  virtual std::string SaveImportedProfile(
+      const AutofillProfile& imported_profile);
 
-  // Saves a credit card value detected in |ImportedFormData|.
-  virtual void SaveImportedCreditCard(const CreditCard& imported_credit_card);
+  // Saves a credit card value detected in |ImportedFormData|. Returns the guid
+  // of the new or updated card, or the empty string if no card was saved.
+  virtual std::string SaveImportedCreditCard(
+      const CreditCard& imported_credit_card);
 
   // Adds |profile| to the web database.
   void AddProfile(const AutofillProfile& profile);
 
   // Updates |profile| which already exists in the web database.
   void UpdateProfile(const AutofillProfile& profile);
 
   // Removes the profile or credit card represented by |guid|.
   virtual void RemoveByGUID(const std::string& guid);
 
@@ skipping 65 matching lines @@
   virtual void Refresh();
 
   const std::string& app_locale() const { return app_locale_; }
 
   // Checks suitability of |profile| for adding to the user's set of profiles.
   static bool IsValidLearnableProfile(const AutofillProfile& profile,
                                       const std::string& app_locale);
 
   // Merges |new_profile| into one of the |existing_profiles| if possible;
   // otherwise appends |new_profile| to the end of that list. Fills
-  // |merged_profiles| with the result.
-  static bool MergeProfile(
+  // |merged_profiles| with the result. Returns the |guid| of the new or updated
+  // profile.
+  static std::string MergeProfile(
       const AutofillProfile& new_profile,
       const std::vector<AutofillProfile*>& existing_profiles,
       const std::string& app_locale,
       std::vector<AutofillProfile>* merged_profiles);
 
  protected:
   // Only PersonalDataManagerFactory and certain tests can create instances of
   // PersonalDataManager.
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FirstMiddleLast);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AutofillIsEnabledAtStartup);
@@ skipping 100 matching lines @@
 
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_