Introduce a couple of abstract bases for WebDataService.

chrome/browser/autofill/autocomplete_history_manager.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_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_
 
 #include <vector>
 
 #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 {
 namespace forms {
 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:
   explicit AutocompleteHistoryManager(content::WebContents* web_contents);
   virtual ~AutocompleteHistoryManager();
 
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // 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
   // dispatched a message.
   void OnGetAutocompleteSuggestions(
       int query_id,
       const string16& name,
       const string16& prefix,
       const std::vector<string16>& autofill_values,
       const std::vector<string16>& autofill_labels,
@@ skipping 10 matching lines @@
  protected:
   friend class AutocompleteHistoryManagerTest;
   friend class AutofillManagerTest;
   FRIEND_TEST_ALL_PREFIXES(AutocompleteHistoryManagerTest, ExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            TestTabContentsWithExternalDelegate);
 
   // 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();
 
   // Exposed for testing.
   AutofillExternalDelegate* external_delegate() {
     return external_delegate_;
   }
 
  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_;
   std::vector<string16> autofill_icons_;
   std::vector<int> autofill_unique_ids_;
 
   // Delegate to perform external processing (display, selection) on
   // our behalf.  Weak.
   AutofillExternalDelegate* external_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteHistoryManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_