Hook up Autofill Backend interface to SyncableServices

chrome/browser/webdata/autocomplete_syncable_service.cc

Index: chrome/browser/webdata/autocomplete_syncable_service.cc
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.cc b/chrome/browser/webdata/autocomplete_syncable_service.cc
index ed05a2b8519874baecb9daad95148b4122658345..f5327eb9e384f01336770dee2a097c7ef342af54 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.cc
+++ b/chrome/browser/webdata/autocomplete_syncable_service.cc
@@ -23,6 +23,7 @@ using autofill::AutofillEntry;
 using autofill::AutofillKey;
 using autofill::AutofillTable;
 using autofill::AutofillWebDataService;
+using autofill::AutofillWebDataBackend;
 using content::BrowserThread;
 
 namespace {
@@ -92,14 +93,14 @@ void* UserDataKey() {
 }  // namespace
 
 AutocompleteSyncableService::AutocompleteSyncableService(
-    AutofillWebDataService* web_data_service)
-    : web_data_service_(web_data_service),
+    AutofillWebDataBackend* autofill_webdata_backend)
+    : autofill_webdata_backend_(autofill_webdata_backend),
       scoped_observer_(this),
       cull_expired_entries_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
-  DCHECK(web_data_service_);
+  DCHECK(autofill_webdata_backend_);
 
-  scoped_observer_.Add(web_data_service_);
+  scoped_observer_.Add(autofill_webdata_backend_);
 }
 
 AutocompleteSyncableService::~AutocompleteSyncableService() {
@@ -108,9 +109,10 @@ AutocompleteSyncableService::~AutocompleteSyncableService() {
 
 // static
 void AutocompleteSyncableService::CreateForWebDataService(
-    AutofillWebDataService* web_data_service) {
+    AutofillWebDataService* web_data_service,
+    AutofillWebDataBackend* autofill_webdata_backend) {
   web_data_service->GetDBUserData()->SetUserData(
-      UserDataKey(), new AutocompleteSyncableService(web_data_service));
+      UserDataKey(), new AutocompleteSyncableService(autofill_webdata_backend));
 }
 
 // static
@@ -121,7 +123,7 @@ AutocompleteSyncableService* AutocompleteSyncableService::FromWebDataService(
 }
 
 AutocompleteSyncableService::AutocompleteSyncableService()
-    : web_data_service_(NULL),
+    : autofill_webdata_backend_(NULL),
       scoped_observer_(this),
       cull_expired_entries_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
@@ -179,7 +181,7 @@ syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
     return merge_result;
   }
 
-  AutofillWebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
+  autofill_webdata_backend_->NotifyOfMultipleAutofillChanges();
 
   syncer::SyncChangeList new_changes;
   for (AutocompleteEntryMap::iterator i = new_db_entries.begin();
@@ -193,7 +195,7 @@ syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
   if (cull_expired_entries_) {
     // This will schedule a deletion operation on the DB thread, which will
     // trigger a notification to propagate the deletion to Sync.
-    web_data_service_->RemoveExpiredFormElements();
+    autofill_webdata_backend_->RemoveExpiredFormElementsWrapper();

[Ilya Sherman, 2013/05/13 23:44:47]

nit: Seems weird for this method, which is part of the public API, to have a
"Wrapper()" suffix.

[Cait (Slow), 2013/05/14 22:30:08]

Agreed. Since this is the only place we call this method from, I've renamed it
(and removed the corresponding method on AutofillWebData, since this is only
getting called from the DB thread) -- WDYT? 

[Ilya Sherman, 2013/05/14 23:03:15]

Much nicer, thanks :)

   }
 
   merge_result.set_error(
@@ -296,12 +298,12 @@ syncer::SyncError AutocompleteSyncableService::ProcessSyncChanges(
         "Failed to update webdata.");
   }
 
-  AutofillWebDataService::NotifyOfMultipleAutofillChanges(web_data_service_);
+  autofill_webdata_backend_->NotifyOfMultipleAutofillChanges();
 
   if (cull_expired_entries_) {
     // This will schedule a deletion operation on the DB thread, which will
     // trigger a notification to propagate the deletion to Sync.
-    web_data_service_->RemoveExpiredFormElements();
+    autofill_webdata_backend_->RemoveExpiredFormElementsWrapper();
   }
 
   return list_processing_error;
@@ -324,7 +326,8 @@ void AutocompleteSyncableService::AutofillEntriesChanged(
 bool AutocompleteSyncableService::LoadAutofillData(
     std::vector<AutofillEntry>* entries) const {
   return AutofillTable::FromWebDatabase(
-      web_data_service_->GetDatabase())->GetAllAutofillEntries(entries);
+      autofill_webdata_backend_->GetDatabase())->GetAllAutofillEntries(
+          entries);
 }
 
 bool AutocompleteSyncableService::SaveChangesToWebData(
@@ -333,7 +336,7 @@ bool AutocompleteSyncableService::SaveChangesToWebData(
 
   if (!new_entries.empty() &&
       !AutofillTable::FromWebDatabase(
-          web_data_service_->GetDatabase())->UpdateAutofillEntries(
+         autofill_webdata_backend_->GetDatabase())->UpdateAutofillEntries(
               new_entries)) {
     return false;
   }
@@ -407,7 +410,7 @@ void AutocompleteSyncableService::WriteAutofillEntry(
 syncer::SyncError AutocompleteSyncableService::AutofillEntryDelete(
     const sync_pb::AutofillSpecifics& autofill) {
   if (!AutofillTable::FromWebDatabase(
-          web_data_service_->GetDatabase())->RemoveFormElement(
+          autofill_webdata_backend_->GetDatabase())->RemoveFormElement(
               UTF8ToUTF16(autofill.name()), UTF8ToUTF16(autofill.value()))) {
     return error_handler_->CreateAndUploadError(
         FROM_HERE,
@@ -426,8 +429,8 @@ void AutocompleteSyncableService::ActOnChanges(
       case AutofillChange::ADD:
       case AutofillChange::UPDATE: {
         std::vector<base::Time> timestamps;
-        if (!AutofillTable::FromWebDatabase(
-                web_data_service_->GetDatabase())->GetAutofillTimestamps(
+        WebDatabase* db = autofill_webdata_backend_->GetDatabase();
+        if (!AutofillTable::FromWebDatabase(db)->GetAutofillTimestamps(
                     change->key().name(),
                     change->key().value(),
                     &timestamps)) {

[Ilya Sherman, 2013/05/13 23:44:47]

nit: De-indent each of these lines four spaces.

[Cait (Slow), 2013/05/14 22:30:08]

Done.