[Autofill] Convert wallet addresses to local autofill profiles.

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 <list>
 #include <memory>
 #include <set>
@@ skipping 165 matching lines @@
   void GetNonEmptyTypes(ServerFieldTypeSet* non_empty_types);
 
   // Returns true if the credit card information is stored with a password.
   bool HasPassword();
 
   // Returns whether the personal data has been loaded from the web database.
   virtual bool IsDataLoaded() const;
 
   // This PersonalDataManager owns these profiles and credit cards.  Their
   // lifetime is until the web database is updated with new profile and credit
-  // card information, respectively.  |GetProfiles()| returns both web and
-  // auxiliary profiles.  |web_profiles()| returns only web profiles.
+  // card information, respectively.
+  // TODO(crbug.com/687352): Remove one of these since they do the same thing.
+  // |GetProfiles()| and |web_profiles()| returns only local profiles.
   virtual const std::vector<AutofillProfile*>& GetProfiles() const;
   virtual std::vector<AutofillProfile*> web_profiles() const;
+  // Returns just SERVER_PROFILES.
+  virtual const std::vector<std::unique_ptr<AutofillProfile>>& server_profiles()
+      const;
   // Returns just LOCAL_CARD cards.
   virtual std::vector<CreditCard*> GetLocalCreditCards() const;
   // Returns all credit cards, server and local.
   virtual const std::vector<CreditCard*>& GetCreditCards() const;

[Roger McFarlane (Chromium), 2017/02/02 16:05:01]

Do you know why these are all virtual? Do they get overridden for test purposes?

So, it looks like consistency is the reason for exposing vector of pointer
instead of directly returning the underlying containers in web_profiles() and
server_profiles().

General a getter (where the method name is just the member name without the
trailing underscore doesn't do any work, it just exposes the const member.

If consistency to the other vector of raw pointer returning methods is
preferred, I'd change them to GetWebProfiles() and GetServerProfiles(),
respectively.

[sebsg, 2017/02/02 16:38:27]

Yeah, they are overrriden in test_personal_data_manager. 

So I brought back the old implementation and return type but change the name to
follow the convention. I would like to change the existing functions in another
CL (already created a bug to refactor this since now we have 2 very similar
functions).It will affect a couple of files and I want to take the time to check
whether we could just return a const ref to the actual data. WDYT?

[Roger McFarlane (Chromium), 2017/02/02 21:02:19]

YOu can return a const ref if the function doesn't filter/combine the data and
the caller doesn't attempt to modify the returned container.

 
-  // Returns true if there is some data synced from Wallet.
-  bool HasServerData() const;
-
   // Returns the profiles to suggest to the user, ordered by frecency.
   const std::vector<AutofillProfile*> GetProfilesToSuggest() const;
 
   // Loads profiles that can suggest data for |type|. |field_contents| is the
   // part the user has already typed. |field_is_autofilled| is true if the field
   // has already been autofilled. |other_field_types| represents the rest of
   // form.
   std::vector<Suggestion> GetProfileSuggestions(
       const AutofillType& type,
       const base::string16& field_contents,
@@ skipping 101 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            ApplyDedupingRoutine_FeatureDisabled);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            ApplyDedupingRoutine_NopIfZeroProfiles);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            ApplyDedupingRoutine_NopIfOneProfile);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            ApplyDedupingRoutine_OncePerVersion);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            ApplyDedupingRoutine_MultipleDedupes);
+  FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
+                           ConvertWalletAddressesToLocalProfiles_NewProfile);
+  FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
+                           ConvertWalletAddressesToLocalProfiles_MergedProfile);
+  FRIEND_TEST_ALL_PREFIXES(
+      PersonalDataManagerTest,
+      ConvertWalletAddressesToLocalProfiles_AlreadyConverted);
+  FRIEND_TEST_ALL_PREFIXES(
+      PersonalDataManagerTest,
+      ConvertWalletAddressesToLocalProfiles_MultipleSimilarWalletAddresses);
   friend class autofill::AutofillInteractiveTest;
   friend class autofill::AutofillTest;
   friend class autofill::PersonalDataManagerFactory;
   friend class PersonalDataManagerTest;
   friend class ProfileSyncServiceAutofillTest;
   friend class ::RemoveAutofillTester;
   friend std::default_delete<PersonalDataManager>;
   friend void autofill_helper::SetProfiles(
       int, std::vector<autofill::AutofillProfile>*);
   friend void autofill_helper::SetCreditCards(
@@ skipping 166 matching lines @@
       std::vector<std::unique_ptr<AutofillProfile>>* existing_profiles,
       std::unordered_set<AutofillProfile*>* profile_guids_to_delete,
       std::unordered_map<std::string, std::string>* guids_merge_map);
 
   // Updates the credit cards' billing address reference based on the merges
   // that happened during the dedupe, as defined in |guids_merge_map|. Also
   // updates the cards entries in the database.
   void UpdateCardsBillingAddressReference(
       const std::unordered_map<std::string, std::string>& guids_merge_map);
 
+  // Converts the wallet addresses to local autofill profiles. This should be
+  // called after all the syncable data has been processed (local cards and
+  // profiles, wallet data and metadata).
+  void ConvertWalletAddressesToLocalProfiles();
+
+  // Tries to merge the |server_address| into the |existing_profiles| if
+  // possible. Adds it to the list if no match is found. The existing profiles
+  // should be sorted by decreasing frecency outside of this method, since this
+  // will be called multiple times in a row. Returns the guid of the new or
+  // updated profile.
+  std::string MergeServerAddressesIntoProfiles(
+      const AutofillProfile& server_address,
+      std::vector<AutofillProfile>* existing_profiles);
+
   const std::string app_locale_;
 
   // The default country code for new addresses.
   mutable std::string default_country_code_;
 
   // The PrefService that this instance uses. Must outlive this instance.
   PrefService* pref_service_;
 
   // The AccountTrackerService that this instance uses. Must outlive this
   // instance.
@@ skipping 19 matching lines @@
 
   // An observer to listen for changes to prefs::kAutofillEnabled.
   std::unique_ptr<BooleanPrefMember> enabled_pref_;
 
   // An observer to listen for changes to prefs::kAutofillWalletImportEnabled.
   std::unique_ptr<BooleanPrefMember> wallet_enabled_pref_;
 
   // True if autofill profile cleanup needs to be performed.
   bool is_autofill_profile_cleanup_pending_ = false;
 
+  // Whether new information was received from the sync server.
+  bool has_synced_new_data = false;
+
 #if defined(OS_ANDROID)
   // The context for the request to be used to fetch libaddressinput's address
   // validation rules.
   scoped_refptr<net::URLRequestContextGetter> context_getter_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_