Rip autofill code out of webdataservice

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 25a149925bdbe19497e352d446499e5c7dced070..9b61701f8bc47bc3cf83a8ee6dd05356d0a88b55 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -18,7 +18,6 @@
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "chrome/browser/api/webdata/autofill_web_data_service.h"
 #include "chrome/browser/api/webdata/web_data_results.h"
 #include "chrome/browser/api/webdata/web_data_service_base.h"
 #include "chrome/browser/api/webdata/web_data_service_consumer.h"
@@ -27,9 +26,6 @@
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/web_database.h"
 
-class AutocompleteSyncableService;
-class AutofillChange;
-class AutofillProfileSyncableService;
 struct DefaultWebIntentService;
 class GURL;
 #if defined(OS_WIN)
@@ -68,8 +64,6 @@ struct WebIntentServiceData;
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-typedef std::vector<AutofillChange> AutofillChangeList;
-
 typedef base::Callback<scoped_ptr<WDTypedResult>(void)> ResultTask;
 
 // Result from GetWebAppImages.
@@ -98,9 +92,7 @@ struct WDKeywordsResult {
 
 class WebDataServiceConsumer;
 
-class WebDataService
-    : public WebDataServiceBase,
-      public AutofillWebData {
+class WebDataService : public WebDataServiceBase {
  public:
   // Retrieve a WebDataService for the given context.
   static scoped_refptr<WebDataService> FromBrowserContext(
@@ -109,13 +101,6 @@ class WebDataService
   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.
-  // NOTE: This method is intended to be called from the DB thread.  It
-  // it asynchronously notifies listeners on the UI thread.
-  // |web_data_service| may be NULL for testing purposes.
-  static void NotifyOfMultipleAutofillChanges(WebDataService* web_data_service);
-
   //////////////////////////////////////////////////////////////////////////////
   //
   // Keywords
@@ -248,48 +233,7 @@ class WebDataService
                      WebDataServiceConsumer* consumer);
 #endif  // defined(OS_WIN)
 
-  //////////////////////////////////////////////////////////////////////////////
-  //
-  // Autofill.
-  //
-  //////////////////////////////////////////////////////////////////////////////
-
-  // AutofillWebData implementation.
-  virtual void AddFormFields(
-      const std::vector<FormFieldData>& fields) OVERRIDE;
-  virtual Handle GetFormValuesForElementName(
-      const string16& name,
-      const string16& prefix,
-      int limit,
-      WebDataServiceConsumer* consumer) OVERRIDE;
-  virtual void RemoveExpiredFormElements() OVERRIDE;
-  virtual void RemoveFormValueForElementName(const string16& name,
-                                             const string16& value) OVERRIDE;
-  virtual void AddAutofillProfile(const AutofillProfile& profile) OVERRIDE;
-  virtual void UpdateAutofillProfile(const AutofillProfile& profile) OVERRIDE;
-  virtual void RemoveAutofillProfile(const std::string& guid) OVERRIDE;
-  virtual Handle GetAutofillProfiles(WebDataServiceConsumer* consumer) OVERRIDE;
-  virtual void AddCreditCard(const CreditCard& credit_card) OVERRIDE;
-  virtual void UpdateCreditCard(const CreditCard& credit_card) OVERRIDE;
-  virtual void RemoveCreditCard(const std::string& guid) OVERRIDE;
-  virtual Handle GetCreditCards(WebDataServiceConsumer* consumer) OVERRIDE;
-
-  // Removes Autofill records from the database.
-  void RemoveAutofillProfilesAndCreditCardsModifiedBetween(
-      const base::Time& delete_begin,
-      const base::Time& delete_end);
-
-  // Removes form elements recorded for Autocomplete from the database.
-  void RemoveFormElementsAddedBetween(const base::Time& delete_begin,
-                                      const base::Time& delete_end);
-
  protected:
-  // TODO(caitkp): We probably don't need these anymore.
-  friend class TemplateURLServiceTest;
-  friend class TemplateURLServiceTestingProfile;
-  friend class WebDataServiceTest;
-  friend class WebDataRequest;
-
   // For unit tests, passes a null callback.
   WebDataService();
 
@@ -382,44 +326,6 @@ class WebDataService
       const IE7PasswordInfo& info, WebDatabase* db);
 #endif  // defined(OS_WIN)
 
-  //////////////////////////////////////////////////////////////////////////////
-  //
-  // Autofill.
-  //
-  //////////////////////////////////////////////////////////////////////////////
-  WebDatabase::State AddFormElementsImpl(
-      const std::vector<FormFieldData>& fields, WebDatabase* db);
-  scoped_ptr<WDTypedResult> GetFormValuesForElementNameImpl(
-      const string16& name, const string16& prefix, int limit, WebDatabase* db);
-  WebDatabase::State RemoveFormElementsAddedBetweenImpl(
-      const base::Time& delete_begin, const base::Time& delete_end,
-      WebDatabase* db);
-  WebDatabase::State RemoveExpiredFormElementsImpl(WebDatabase* db);
-  WebDatabase::State RemoveFormValueForElementNameImpl(
-      const string16& name, const string16& value, WebDatabase* db);
-  WebDatabase::State AddAutofillProfileImpl(
-      const AutofillProfile& profile, WebDatabase* db);
-  WebDatabase::State UpdateAutofillProfileImpl(
-      const AutofillProfile& profile, WebDatabase* db);
-  WebDatabase::State RemoveAutofillProfileImpl(
-      const std::string& guid, WebDatabase* db);
-  scoped_ptr<WDTypedResult> GetAutofillProfilesImpl(WebDatabase* db);
-  WebDatabase::State AddCreditCardImpl(
-      const CreditCard& credit_card, WebDatabase* db);
-  WebDatabase::State UpdateCreditCardImpl(
-      const CreditCard& credit_card, WebDatabase* db);
-  WebDatabase::State RemoveCreditCardImpl(
-      const std::string& guid, WebDatabase* db);
-  scoped_ptr<WDTypedResult> GetCreditCardsImpl(WebDatabase* db);
-  WebDatabase::State RemoveAutofillProfilesAndCreditCardsModifiedBetweenImpl(
-      const base::Time& delete_begin, const base::Time& delete_end,
-      WebDatabase* db);
-
-  // Callbacks to ensure that sensitive info is destroyed if request is
-  // cancelled.
-  void DestroyAutofillProfileResult(const WDTypedResult* result);
-  void DestroyAutofillCreditCardResult(const WDTypedResult* result);
-
   DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };