Hook up Autofill Backend interface to SyncableServices

components/autofill/browser/webdata/autofill_webdata_service.cc

 // Copyright (c) 2012 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/browser/webdata/autofill_webdata_service.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/autofill/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/common/form_field_data.h"
 #include "components/webdata/common/web_database_service.h"
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
 namespace autofill {
 
-// static
-void AutofillWebDataService::NotifyOfMultipleAutofillChanges(
-    AutofillWebDataService* web_data_service) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-
-  if (!web_data_service)
-    return;
-
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      Bind(&AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread,
-           make_scoped_refptr(web_data_service)));
-}
-
 AutofillWebDataService::AutofillWebDataService(
     scoped_refptr<WebDatabaseService> wdbs,
     const ProfileErrorCallback& callback)
     : WebDataServiceBase(wdbs, callback),
       autofill_backend_(new AutofillWebDataBackend()) {
 }
 
 AutofillWebDataService::AutofillWebDataService()
     : WebDataServiceBase(NULL,
                          WebDataServiceBase::ProfileErrorCallback()),
@@ skipping 13 matching lines @@
   if (!db_thread_user_data_)
     db_thread_user_data_.reset(new SupportsUserDataAggregatable());
   return db_thread_user_data_.get();
 }
 
 void AutofillWebDataService::ShutdownOnDBThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_thread_user_data_.reset();
 }
 
+void AutofillWebDataService::GetDelegateOnDB(
+    const DelegateOnDBCallback& del_callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  wdbs_->GetDatabaseOnDB(
+      Bind(&AutofillWebDataBackend::GetDelegate, autofill_backend_,
+          del_callback));
+}
+
 void AutofillWebDataService::AddFormFields(
     const std::vector<FormFieldData>& fields) {
   wdbs_->ScheduleDBTask(FROM_HERE,
       Bind(&AutofillWebDataBackend::AddFormElementsImpl,
            autofill_backend_, fields));
 }
 
 WebDataServiceBase::Handle AutofillWebDataService::GetFormValuesForElementName(
     const base::string16& name, const base::string16& prefix, int limit,
     WebDataServiceConsumer* consumer) {
@@ skipping 82 matching lines @@
 void AutofillWebDataService::RemoveAutofillDataModifiedBetween(
     const Time& delete_begin,
     const Time& delete_end) {
   wdbs_->ScheduleDBTask(
       FROM_HERE,
       Bind(&AutofillWebDataBackend::RemoveAutofillDataModifiedBetweenImpl,
            autofill_backend_, delete_begin, delete_end));
 }
 
 void AutofillWebDataService::AddObserver(
-    AutofillWebDataServiceObserverOnDBThread* observer) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (autofill_backend_)
-    autofill_backend_->AddObserver(observer);
-}
-
-void AutofillWebDataService::RemoveObserver(
-    AutofillWebDataServiceObserverOnDBThread* observer) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  if (autofill_backend_)
-    autofill_backend_->RemoveObserver(observer);
-}
-
-void AutofillWebDataService::AddObserver(
     AutofillWebDataServiceObserverOnUIThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_observer_list_.AddObserver(observer);
 }
 
 void AutofillWebDataService::RemoveObserver(
     AutofillWebDataServiceObserverOnUIThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ui_observer_list_.RemoveObserver(observer);
 }
 
 AutofillWebDataService::~AutofillWebDataService() {
   DCHECK(!db_thread_user_data_.get()) << "Forgot to call ShutdownOnUIThread?";
 }
 
 void AutofillWebDataService::NotifyAutofillMultipleChangedOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FOR_EACH_OBSERVER(AutofillWebDataServiceObserverOnUIThread,
                     ui_observer_list_,
                     AutofillMultipleChanged());
 }
 
 }  // namespace autofill