Split Autofill webdata

chrome/browser/webdata/web_data_service.h

Index: chrome/browser/webdata/web_data_service.h
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index a21ad3dab0615cd3fe5b6fa74086a19f3904b8de..d5d6c25646289fccf343df3e288be5e4abe477fb 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -107,11 +107,8 @@ class WebDataService
   static scoped_refptr<WebDataService> FromBrowserContext(
       content::BrowserContext* context);
 
-  WebDataService();
-
-  // WebDataServiceBase implementation.
-  virtual void ShutdownOnUIThread() OVERRIDE;
-  virtual void Init(const base::FilePath& path) OVERRIDE;
+  WebDataService(scoped_refptr<WebDatabaseService> wdbs,
+      const ProfileErrorCallback& callback);
 
   // Notifies listeners on the UI thread that multiple changes have been made to
   // to Autofill records of the database.
@@ -120,8 +117,6 @@ class WebDataService
   // |web_data_service| may be NULL for testing purposes.
   static void NotifyOfMultipleAutofillChanges(WebDataService* web_data_service);
 
-
-
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords
@@ -289,16 +284,6 @@ class WebDataService
   void RemoveFormElementsAddedBetween(const base::Time& delete_begin,
                                       const base::Time& delete_end);
 
-  // Returns the syncable service for Autofill addresses and credit cards stored
-  // in this table. The returned service is owned by |this| object.
-  virtual AutofillProfileSyncableService*
-      GetAutofillProfileSyncableService() const;
-
-  // Returns the syncable service for field autocomplete stored in this table.
-  // The returned service is owned by |this| object.
-  virtual AutocompleteSyncableService*
-      GetAutocompleteSyncableService() const;
-
  protected:
   // TODO(caitkp): We probably don't need these anymore.
   friend class TemplateURLServiceTest;
@@ -306,20 +291,12 @@ class WebDataService
   friend class WebDataServiceTest;
   friend class WebDataRequest;
 
+  // For unit tests, passes a null callback.
+  WebDataService();
+
   virtual ~WebDataService();
 
-  //////////////////////////////////////////////////////////////////////////////
-  //
-  // The following methods are only invoked in the web data service thread.
-  //
-  //////////////////////////////////////////////////////////////////////////////
  private:
-  // Initialize any syncable services.
-  void InitializeSyncableServices();
-
-  // Deletes the syncable services.
-  void ShutdownSyncableServices();
-
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords.
@@ -438,14 +415,6 @@ class WebDataService
   void DestroyAutofillProfileResult(const WDTypedResult* result);
   void DestroyAutofillCreditCardResult(const WDTypedResult* result);
 
-  // Syncable services for the database data.  We own the services, but don't
-  // use |scoped_ptr|s because the lifetimes must be managed on the database
-  // thread.
-  // Currently only Autocomplete and Autofill profiles use the new Sync API, but
-  // all the database data should migrate to this API over time.
-  AutocompleteSyncableService* autocomplete_syncable_service_;
-  AutofillProfileSyncableService* autofill_profile_syncable_service_;
-
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };