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 fd3244c74443db11035feb502638fbe97ad9f5c5..ac863dcff2044ad68bb6c722e46d2ffa18d9b36f 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.h
+++ b/chrome/browser/webdata/autocomplete_syncable_service.h
@@ -17,7 +17,6 @@
 #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_service.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
@@ -34,6 +33,11 @@ namespace sync_pb {
 class AutofillSpecifics;
 }
 
+namespace autofill {
+class AutofillBackendDelegate;
+class AutofillWebDataService;
+}  // namespace autofill
+
 // The sync implementation for autocomplete.
 // MergeDataAndStartSyncing() called first, it does cloud->local and
 // local->cloud syncs. Then for each cloud change we receive
@@ -49,7 +53,8 @@ class AutocompleteSyncableService
   // Creates a new AutocompleteSyncableService and hangs it off of
   // |web_data_service|, which takes ownership.
   static void CreateForWebDataService(
-      autofill::AutofillWebDataService* web_data_service);
+      autofill::AutofillWebDataService* web_data_service,
+      autofill::AutofillBackendDelegate* web_data_delegate);
 
   // Retrieves the AutocompleteSyncableService stored on |web_data|.
   static AutocompleteSyncableService* FromWebDataService(
@@ -81,6 +86,7 @@ class AutocompleteSyncableService
 
  protected:
   explicit AutocompleteSyncableService(
+      autofill::AutofillBackendDelegate* web_data_delegate,
       autofill::AutofillWebDataService* web_data_service);
 
   // Helper to query WebDatabase for the current autocomplete state.
@@ -148,9 +154,10 @@ class AutocompleteSyncableService
 
   // Lifetime of AutocompleteSyncableService object is shorter than
   // |web_data_service_| passed to it.
+  autofill::AutofillBackendDelegate* web_data_delegate_;
   autofill::AutofillWebDataService* web_data_service_;
 
-  ScopedObserver<autofill::AutofillWebDataService, AutocompleteSyncableService>
+  ScopedObserver<autofill::AutofillBackendDelegate, AutocompleteSyncableService>
       scoped_observer_;
 
   // We receive ownership of |sync_processor_| in MergeDataAndStartSyncing() and