Create an AutofillBackend interface

components/autofill/browser/webdata/autofill_webdata_backend.h

Index: components/autofill/browser/webdata/autofill_webdata_backend.h
diff --git a/components/autofill/browser/webdata/autofill_webdata_backend.h b/components/autofill/browser/webdata/autofill_webdata_backend.h
index b1ab6d63b089552b6c7f2106f0384181589e0374..6287de7fd43f5c72dfec85f3a06a8c6d59920517 100644
--- a/components/autofill/browser/webdata/autofill_webdata_backend.h
+++ b/components/autofill/browser/webdata/autofill_webdata_backend.h
@@ -5,124 +5,39 @@
 #ifndef COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
 #define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_
 
-#include "base/memory/ref_counted.h"
-#include "base/observer_list.h"
-#include "components/autofill/browser/webdata/autofill_webdata.h"
-#include "components/autofill/common/form_field_data.h"
-#include "components/webdata/common/web_data_results.h"
-#include "components/webdata/common/web_data_service_base.h"
-#include "components/webdata/common/web_data_service_consumer.h"
-#include "components/webdata/common/web_database.h"
+class WebDatabase;
 
 namespace autofill {
 
-class AutofillChange;
-class AutofillProfile;
 class AutofillWebDataServiceObserverOnDBThread;
-class CreditCard;
 
-// Backend implentation for the AutofillWebDataService. This class runs on the
-// DB thread, as it handles reads and writes to the WebDatabase, and functions
-// in it should only be called from that thread. Most functions here are just
-// the implementations of the corresponding functions in the Autofill
-// WebDataService.
-class AutofillWebDataBackend
-    : public base::RefCountedThreadSafe<AutofillWebDataBackend,
-          content::BrowserThread::DeleteOnDBThread> {
+// Interface for doing Autofill work directly on the DB thread (used by
+// Sync, mostly), without fully exposing the AutofillWebDataBackend to clients.
+class AutofillWebDataBackend {
  public:
-  AutofillWebDataBackend();
+  virtual ~AutofillWebDataBackend() {}
 
-  // Adds form fields to the web database.
-  WebDatabase::State AddFormElements(const std::vector<FormFieldData>& fields,
-                                     WebDatabase* db);
-
-  // Returns a vector of values which have been entered in form input fields
-  // named |name|.
-  scoped_ptr<WDTypedResult> GetFormValuesForElementName(
-      const base::string16& name,
-      const base::string16& prefix,
-      int limit,
-      WebDatabase* db);
-
-  // Removes form elements recorded for Autocomplete from the database.
-  WebDatabase::State RemoveFormElementsAddedBetween(
-      const base::Time& delete_begin,
-      const base::Time& delete_end,
-      WebDatabase* db);
-
-  // Removes expired form elements recorded for Autocomplete from the database.
-  WebDatabase::State RemoveExpiredFormElements(WebDatabase* db);
-
-  // Removes the Form-value |value| which has been entered in form input fields
-  // named |name| from the database.
-  WebDatabase::State RemoveFormValueForElementName(const base::string16& name,
-                                                   const base::string16& value,
-                                                   WebDatabase* db);
-
-  // Adds an Autofill profile to the web database.
-  WebDatabase::State AddAutofillProfile(const AutofillProfile& profile,
-                                        WebDatabase* db);
-
-  // Updates an Autofill profile in the web database.
-  WebDatabase::State UpdateAutofillProfile(const AutofillProfile& profile,
-                                           WebDatabase* db);
-
-  // Removes an Autofill profile from the web database.
-  WebDatabase::State RemoveAutofillProfile(const std::string& guid,
-                                           WebDatabase* db);
-
-  // Returns all Autofill profiles from the web database.
-  scoped_ptr<WDTypedResult> GetAutofillProfiles(WebDatabase* db);
-
-  // Adds a credit card to the web database.
-  WebDatabase::State AddCreditCard(const CreditCard& credit_card,
-                                   WebDatabase* db);
-
-  // Updates a credit card in the web database.
-  WebDatabase::State UpdateCreditCard(const CreditCard& credit_card,
-                                      WebDatabase* db);
-
-  // Removes a credit card from the web database.
-  WebDatabase::State RemoveCreditCard(const std::string& guid,
-                                      WebDatabase* db);
-
-  // Returns a vector of all credit cards from the web database.
-  scoped_ptr<WDTypedResult> GetCreditCards(WebDatabase* db);
-
-  // Removes Autofill records from the database.
-  WebDatabase::State RemoveAutofillDataModifiedBetween(
-      const base::Time& delete_begin,
-      const base::Time& delete_end,
-      WebDatabase* db);
+  // Get a raw pointer to the WebDatabase.
+  virtual WebDatabase* GetDatabase() = 0;
 
   // Add an observer to be notified of changes on the DB thread.
-  void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
+  virtual void AddObserver(
+      AutofillWebDataServiceObserverOnDBThread* observer) = 0;
 
   // Remove an observer.
-  void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
-
- protected:
-  virtual ~AutofillWebDataBackend();
-
- private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::DB>;
-  friend class base::DeleteHelper<AutofillWebDataBackend>;
-  // We have to friend RCTS<> so WIN shared-lib build is happy
-  // (http://crbug/112250).
-  friend class base::RefCountedThreadSafe<AutofillWebDataBackend,
-      content::BrowserThread::DeleteOnDBThread>;
-
-  // Callbacks to ensure that sensitive info is destroyed if request is
-  // cancelled.
-  void DestroyAutofillProfileResult(const WDTypedResult* result);
-  void DestroyAutofillCreditCardResult(const WDTypedResult* result);
+  virtual void RemoveObserver(
+      AutofillWebDataServiceObserverOnDBThread* observer) = 0;
 
-  ObserverList<AutofillWebDataServiceObserverOnDBThread> db_observer_list_;
+  // Remove expired elements from the database and commit if needed.
+  virtual void RemoveExpiredFormElementsWrapper() = 0;
 
-  DISALLOW_COPY_AND_ASSIGN(AutofillWebDataBackend);
+  // 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
+  // asynchronously notifies listeners on the UI thread.
+  virtual void NotifyOfMultipleAutofillChanges() = 0;
 };
 
-}  // namespace autofill
+} // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_BACKEND_H_