[Merge M53] Run autofill-profile de-dupe after sync starts if sync is enabled.

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 <memory>
 #include <set>
 #include <vector>
@@ skipping 18 matching lines @@
 class Browser;
 class PrefService;
 class RemoveAutofillTester;
 class SigninManagerBase;
 
 #if defined(OS_IOS)
 // TODO(crbug.com/513344): Remove this once Chrome on iOS is unforked.
 class PersonalDataManagerFactory;
 #endif
 
+namespace sync_driver {
+class SyncService;
+}
+
 namespace autofill {
 class AutofillInteractiveTest;
 class AutofillTest;
 class FormStructure;
 class PersonalDataManagerObserver;
 class PersonalDataManagerFactory;
 }  // namespace autofill
 
 namespace autofill_helper {
 void SetProfiles(int, std::vector<autofill::AutofillProfile>*);
@@ skipping 19 matching lines @@
   // Kicks off asynchronous loading of profiles and credit cards.
   // |pref_service| must outlive this instance.  |is_off_the_record| informs
   // this instance whether the user is currently operating in an off-the-record
   // context.
   void Init(scoped_refptr<AutofillWebDataService> database,
             PrefService* pref_service,
             AccountTrackerService* account_tracker,
             SigninManagerBase* signin_manager,
             bool is_off_the_record);
 
+  // Called once the sync service is known to be instantiated. Note that it may
+  // not be started, but it's preferences can be queried.
+  void OnSyncServiceInitialized(sync_driver::SyncService* sync_service);
+
   // WebDataServiceConsumer:
   void OnWebDataServiceRequestDone(WebDataServiceBase::Handle h,
                                    const WDTypedResult* result) override;
 
   // AutofillWebDataServiceObserverOnUIThread:
   void AutofillMultipleChanged() override;
+  void SyncStarted(syncer::ModelType model_type) override;
 
   // Adds a listener to be notified of PersonalDataManager events.
   virtual void AddObserver(PersonalDataManagerObserver* observer);
 
   // Removes |observer| as an observer of this PersonalDataManager.
   virtual void RemoveObserver(PersonalDataManagerObserver* observer);
 
   // Scans the given |form| for importable Autofill data. If the form includes
   // sufficient address data for a new profile, it is immediately imported. If
   // the form includes sufficient credit card data for a new credit card, it is
@@ skipping 383 matching lines @@
   // Whether we have already logged the number of local credit cards this
   // session.
   mutable bool has_logged_credit_card_count_;
 
   // 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_;
 
+  // Set to true if autofill profile deduplication is enabled and needs to be
+  // performed on the next data refresh.
+  bool is_autofill_profile_dedupe_pending_ = false;
+
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_PERSONAL_DATA_MANAGER_H_