Introduce a couple of abstract bases for WebDataService.

chrome/browser/autofill/autocomplete_history_manager_unittest.cc

 // 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.
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/webdata/autofill_web_data_service_impl.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 #include "webkit/forms/form_data.h"
 
@@ skipping 14 matching lines @@
 class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   AutocompleteHistoryManagerTest()
       : ui_thread_(BrowserThread::UI, MessageLoopForUI::current()),
         db_thread_(BrowserThread::DB) {
   }
 
   virtual void SetUp() {
     ChromeRenderViewHostTestHarness::SetUp();
     web_data_service_ = new MockWebDataService();
-    autocomplete_manager_.reset(new AutocompleteHistoryManager(
-        contents(), &profile_, web_data_service_));
+    autocomplete_manager_.reset(
+        new AutocompleteHistoryManager(
+            contents(),
+            &profile_,
+            scoped_ptr<AutofillWebDataService>(
+                new AutofillWebDataServiceImpl(web_data_service_))));
   }
 
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
 
   TestingProfile profile_;
   scoped_refptr<MockWebDataService> web_data_service_;
   scoped_ptr<AutocompleteHistoryManager> autocomplete_manager_;
 };
 
@@ skipping 102 matching lines @@
                     const std::vector<string16>& autofill_labels,
                     const std::vector<string16>& autofill_icons,
                     const std::vector<int>& autofill_unique_ids));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);
 };
 
 class AutocompleteHistoryManagerStubSend : public AutocompleteHistoryManager {
  public:
-  explicit AutocompleteHistoryManagerStubSend(WebContents* web_contents,
-                                              Profile* profile,
-                                              WebDataService* wds)
-      : AutocompleteHistoryManager(web_contents, profile, wds) {}
+  explicit AutocompleteHistoryManagerStubSend(
+      WebContents* web_contents,
+      Profile* profile,
+      scoped_ptr<AutofillWebDataService> wds)
+      : AutocompleteHistoryManager(web_contents, profile, wds.Pass()) {}
 
   // Intentionally swallow the message.
   virtual bool Send(IPC::Message* message) { delete message; return true; }
 };
 
 }  // namespace
 
 // Make sure our external delegate is called at the right time.
 TEST_F(AutocompleteHistoryManagerTest, ExternalDelegate) {
   // Local version with a stubbed out Send()
   AutocompleteHistoryManagerStubSend autocomplete_history_manager(
       contents(),
-      &profile_, web_data_service_);
+      &profile_,
+      scoped_ptr<AutofillWebDataService>(
+          new AutofillWebDataServiceImpl(web_data_service_)));
 
   MockAutofillExternalDelegate external_delegate(
       TabContents::FromWebContents(contents()));
   EXPECT_CALL(external_delegate, OnSuggestionsReturned(_, _,  _,  _,  _));
   autocomplete_history_manager.SetExternalDelegate(&external_delegate);
 
   // Should trigger a call to OnSuggestionsReturned, verified by the mock.
   autocomplete_history_manager.SendSuggestions(NULL);
 }