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

components/autofill/core/browser/webdata/autofill_webdata_service.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_webdata_service.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 16 matching lines @@
 namespace autofill {
 
 AutofillWebDataService::AutofillWebDataService(
     scoped_refptr<WebDatabaseService> wdbs,
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread,
     const ProfileErrorCallback& callback)
     : WebDataServiceBase(wdbs, callback, ui_thread),
       ui_thread_(ui_thread),
       db_thread_(db_thread),
-      autofill_backend_(NULL),
+      autofill_backend_(nullptr),
       weak_ptr_factory_(this) {
   base::Closure on_changed_callback = Bind(
       &AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread,
       weak_ptr_factory_.GetWeakPtr());
-
+  base::Callback<void(syncer::ModelType)> on_sync_started_callback = Bind(
+      &AutofillWebDataService::NotifySyncStartedOnUIThread,
+      weak_ptr_factory_.GetWeakPtr());
   autofill_backend_ = new AutofillWebDataBackendImpl(
-      wdbs_->GetBackend(), ui_thread_, db_thread_, on_changed_callback);
+      wdbs_->GetBackend(), ui_thread_, db_thread_, on_changed_callback,
+      on_sync_started_callback);
 }
 
 AutofillWebDataService::AutofillWebDataService(
     scoped_refptr<base::SingleThreadTaskRunner> ui_thread,
     scoped_refptr<base::SingleThreadTaskRunner> db_thread)
-    : WebDataServiceBase(NULL,
+    : WebDataServiceBase(nullptr,
                          WebDataServiceBase::ProfileErrorCallback(),
                          ui_thread),
       ui_thread_(ui_thread),
       db_thread_(db_thread),
-      autofill_backend_(new AutofillWebDataBackendImpl(NULL,
-                                                       ui_thread_,
-                                                       db_thread_,
-                                                       base::Closure())),
-      weak_ptr_factory_(this) {
-}
+      autofill_backend_(new AutofillWebDataBackendImpl(
+          nullptr,
+          ui_thread_,
+          db_thread_,
+          base::Closure(),
+          base::Callback<void(syncer::ModelType)>())),
+      weak_ptr_factory_(this) {}
 
 void AutofillWebDataService::ShutdownOnUIThread() {
   weak_ptr_factory_.InvalidateWeakPtrs();
   db_thread_->PostTask(FROM_HERE,
       Bind(&AutofillWebDataBackendImpl::ResetUserData, autofill_backend_));
   WebDataServiceBase::ShutdownOnUIThread();
 }
 
 void AutofillWebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
@@ skipping 218 matching lines @@
 AutofillWebDataService::~AutofillWebDataService() {
 }
 
 void AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread() {
   DCHECK(ui_thread_->BelongsToCurrentThread());
   FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnUIThread,
                     ui_observer_list_,
                     AutofillMultipleChanged());
 }
 
+void AutofillWebDataService::NotifySyncStartedOnUIThread(
+    syncer::ModelType model_type) {
+  DCHECK(ui_thread_->BelongsToCurrentThread());
+  FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnUIThread,
+                    ui_observer_list_,
+                    SyncStarted(model_type));
+}
+
 }  // namespace autofill