Introduce a couple of abstract bases for WebDataService.

chrome/browser/autofill/autocomplete_history_manager.h

Index: chrome/browser/autofill/autocomplete_history_manager.h
diff --git a/chrome/browser/autofill/autocomplete_history_manager.h b/chrome/browser/autofill/autocomplete_history_manager.h
index e45cf3a91f965c8d1c31d6065c27812308b7e311..41d0ba60a3efcec1e0f3f7377d6714611fc2e072 100644
--- a/chrome/browser/autofill/autocomplete_history_manager.h
+++ b/chrome/browser/autofill/autocomplete_history_manager.h
@@ -9,7 +9,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/api/prefs/pref_member.h"
-#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/api/webdata/autofill_web_data.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace webkit {
@@ -21,8 +21,9 @@ struct FormData;
 class AutofillExternalDelegate;
 class Profile;
 
-// Per-tab Autocomplete history manager. Handles receiving form data from the
-// renderer and the storing and retrieving of form data through WebDataService.
+// Per-tab Autocomplete history manager. Handles receiving form data
+// from the renderer and the storing and retrieving of form data
+// through WebDataServiceBase.
 class AutocompleteHistoryManager : public content::WebContentsObserver,
                                    public WebDataServiceConsumer {
  public:
@@ -34,7 +35,7 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
 
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(
-      WebDataService::Handle h,
+      WebDataServiceBase::Handle h,
       const WDTypedResult* result) OVERRIDE;
 
   // Pass-through functions that are called by AutofillManager, after it has
@@ -65,7 +66,7 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
   // For tests.
   AutocompleteHistoryManager(content::WebContents* web_contents,
                              Profile* profile,
-                             WebDataService* wds);
+                             AutofillWebDataService* wds);

[dhollowa, 2012/09/07 16:04:01]

nit: I liked your change to using |service| as the variable name for this.

 
   void SendSuggestions(const std::vector<string16>* suggestions);
   void CancelPendingQuery();
@@ -77,14 +78,14 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
 
  private:
   Profile* profile_;
-  scoped_refptr<WebDataService> web_data_service_;
+  scoped_ptr<AutofillWebDataService> autofill_data_;

[dhollowa, 2012/09/07 16:04:01]

nit: |service_| or |data_service_|?

 
   BooleanPrefMember autofill_enabled_;
 
-  // When the manager makes a request from WebDataService, the database is
+  // When the manager makes a request from WebDataServiceBase, the database is
   // queried on another thread, we record the query handle until we get called
   // back.  We also store the autofill results so we can send them together.
-  WebDataService::Handle pending_query_handle_;
+  WebDataServiceBase::Handle pending_query_handle_;
   int query_id_;
   std::vector<string16> autofill_values_;
   std::vector<string16> autofill_labels_;