Hook up Autofill Backend interface to SyncableServices

chrome/browser/webdata/autocomplete_syncable_service.h

Index: chrome/browser/webdata/autocomplete_syncable_service.h
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.h b/chrome/browser/webdata/autocomplete_syncable_service.h
index a5bfb5d82eb4d7b9a601b632b20b258ece2289f9..d4df76d123efebf4fbc9a5228d5a8615d0fa4be3 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.h
+++ b/chrome/browser/webdata/autocomplete_syncable_service.h
@@ -17,6 +17,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
+#include "components/autofill/browser/webdata/autofill_webdata_backend.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "sync/api/sync_change.h"
@@ -49,7 +50,8 @@ class AutocompleteSyncableService
   // Creates a new AutocompleteSyncableService and hangs it off of
   // |web_data_service|, which takes ownership.
   static void CreateForWebDataService(

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

Optional nit: Should this name be updated to
"CreateForWebDataServiceAndBackend()"?  That name is a little unwieldy though :/

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

Done.

-      autofill::AutofillWebDataService* web_data_service);
+      autofill::AutofillWebDataService* web_data_service,
+      autofill::AutofillWebDataBackend* syncable_service_backend);

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

nit: Name this "autofill_webdata_backend" to match the member variable, or
perhaps drop the "autofill_" prefix from both.

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

Done.

 
   // Retrieves the AutocompleteSyncableService stored on |web_data|.
   static AutocompleteSyncableService* FromWebDataService(
@@ -86,7 +88,7 @@ class AutocompleteSyncableService
 
  protected:
   explicit AutocompleteSyncableService(
-      autofill::AutofillWebDataService* web_data_service);
+      autofill::AutofillWebDataBackend* syncable_service_backend);

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

nit: Ditto.

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

Done.

 
   // Helper to query WebDatabase for the current autocomplete state.
   // Made virtual for ease of mocking in the unit-test.
@@ -152,10 +154,10 @@ class AutocompleteSyncableService
   }
 
   // Lifetime of AutocompleteSyncableService object is shorter than
-  // |web_data_service_| passed to it.
-  autofill::AutofillWebDataService* web_data_service_;
+  // |autofill_webdata_backend_| passed to it.
+  autofill::AutofillWebDataBackend* autofill_webdata_backend_;
 
-  ScopedObserver<autofill::AutofillWebDataService, AutocompleteSyncableService>
+  ScopedObserver<autofill::AutofillWebDataBackend, AutocompleteSyncableService>
       scoped_observer_;
 
   // We receive ownership of |sync_processor_| in MergeDataAndStartSyncing() and