Hook up Autofill Backend interface to SyncableServices

chrome/browser/webdata/autocomplete_syncable_service.h

 // 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.
 #ifndef CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/supports_user_data.h"
 #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"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/syncable_service.h"
 
 class ProfileSyncServiceAutofillTest;
 
 namespace syncer {
@@ skipping 11 matching lines @@
 class AutocompleteSyncableService
     : public base::SupportsUserData::Data,
       public syncer::SyncableService,
       public autofill::AutofillWebDataServiceObserverOnDBThread,
       public base::NonThreadSafe {
  public:
   virtual ~AutocompleteSyncableService();
 
   // Creates a new AutocompleteSyncableService and hangs it off of
   // |web_data_service|, which takes ownership.
-  static void CreateForWebDataService(
-      autofill::AutofillWebDataService* web_data_service);
+  static void CreateForWebDataServiceAndBackend(
+      autofill::AutofillWebDataService* web_data_service,
+      autofill::AutofillWebDataBackend* webdata_backend);
 
   // Retrieves the AutocompleteSyncableService stored on |web_data|.
   static AutocompleteSyncableService* FromWebDataService(
       autofill::AutofillWebDataService* web_data_service);
 
   static syncer::ModelType model_type() { return syncer::AUTOFILL; }
 
   // syncer::SyncableService implementation.
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
@@ skipping 16 matching lines @@
   void UpdateCullSetting(bool cull_expired_entries);
   bool cull_expired_entries() const { return cull_expired_entries_; }
 
   // Provides a StartSyncFlare to the SyncableService. See
   // sync_start_util for more.
   void InjectStartSyncFlare(
       const syncer::SyncableService::StartSyncFlare& flare);
 
  protected:
   explicit AutocompleteSyncableService(
-      autofill::AutofillWebDataService* web_data_service);
+      autofill::AutofillWebDataBackend* webdata_backend);
 
   // Helper to query WebDatabase for the current autocomplete state.
   // Made virtual for ease of mocking in the unit-test.
   virtual bool LoadAutofillData(
       std::vector<autofill::AutofillEntry>* entries) const;
 
   // Helper to persist any changes that occured during model association to
   // the WebDatabase. |entries| will be either added or updated.
   // Made virtual for ease of mocking in the unit-test.
   virtual bool SaveChangesToWebData(
@@ skipping 45 matching lines @@
   static std::string KeyToTag(const std::string& name,
                               const std::string& value);
 
   // For unit-tests.
   AutocompleteSyncableService();
   void set_sync_processor(syncer::SyncChangeProcessor* sync_processor) {
     sync_processor_.reset(sync_processor);
   }
 
   // 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* webdata_backend_;
 
-  ScopedObserver<autofill::AutofillWebDataService, AutocompleteSyncableService>
+  ScopedObserver<autofill::AutofillWebDataBackend, AutocompleteSyncableService>
       scoped_observer_;
 
   // We receive ownership of |sync_processor_| in MergeDataAndStartSyncing() and
   // destroy it in StopSyncing().
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
   // We receive ownership of |error_handler_| in MergeDataAndStartSyncing() and
   // destroy it in StopSyncing().
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
   // Whether we should cull expired autofill entries, can be updated by sync
   // via UpdateCullingSetting.
   bool cull_expired_entries_;
 
   syncer::SyncableService::StartSyncFlare flare_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteSyncableService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_