Make WebDataService no longer depend on ProfileKeyedService

components/autofill/browser/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/prefs/testing_pref_service.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 18 matching lines @@
 using testing::_;
 
 namespace {
 
 class MockWebDataService : public WebDataService {
  public:
   MockWebDataService() {
     current_mock_web_data_service_ = this;
   }
 
-  static scoped_refptr<RefcountedProfileKeyedService> Build(Profile* profile) {
+  MOCK_METHOD1(AddFormFields, void(const std::vector<FormFieldData>&));
+
+  static scoped_refptr<MockWebDataService> GetCurrent() {
+    if (!current_mock_web_data_service_) {
+      return new MockWebDataService();
+    }
     return current_mock_web_data_service_;
   }
 
-  virtual void ShutdownOnUIThread() OVERRIDE {}
-
-  MOCK_METHOD1(AddFormFields, void(const std::vector<FormFieldData>&));
-
  protected:
   virtual ~MockWebDataService() {}
 
  private:
   // Keep track of the most recently created instance, so that it can be
   // associated with the current profile when Build() is called.
   static MockWebDataService* current_mock_web_data_service_;
 };
 
 MockWebDataService* MockWebDataService::current_mock_web_data_service_ = NULL;
 
+class MockWebDataServiceWrapper : public WebDataServiceWrapper {
+ public:
+  static ProfileKeyedService* Build(Profile* profile) {
+    return new MockWebDataServiceWrapper();
+  }
+
+  MockWebDataServiceWrapper() {
+  }
+
+  void Shutdown() OVERRIDE {}
+
+  ~MockWebDataServiceWrapper() {}
+
+  scoped_refptr<WebDataService> GetWebData() OVERRIDE {
+    return MockWebDataService::GetCurrent();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapper);
+};
+
 class MockAutofillManagerDelegate
     : public autofill::TestAutofillManagerDelegate {
  public:
   MockAutofillManagerDelegate() {}
   virtual ~MockAutofillManagerDelegate() {}
   virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
 
  private:
   TestingPrefServiceSimple prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
 };
 
 }  // namespace
 
 class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   AutocompleteHistoryManagerTest()
-      : db_thread_(BrowserThread::DB) {
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        db_thread_(BrowserThread::DB) {
   }
 
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     web_data_service_ = new MockWebDataService();
     WebDataServiceFactory::GetInstance()->SetTestingFactory(
-        profile(), MockWebDataService::Build);
+        profile(), MockWebDataServiceWrapper::Build);
     autocomplete_manager_.reset(new AutocompleteHistoryManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     autocomplete_manager_.reset();
     web_data_service_ = NULL;
     ChromeRenderViewHostTestHarness::TearDown();
+    message_loop_.RunUntilIdle();
+
   }
 
+  content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_refptr<MockWebDataService> web_data_service_;
   scoped_ptr<AutocompleteHistoryManager> autocomplete_manager_;
   MockAutofillManagerDelegate manager_delegate;
 };
 
 // Tests that credit card numbers are not sent to the WebDatabase to be saved.
 TEST_F(AutocompleteHistoryManagerTest, CreditCardNumberValue) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
@@ skipping 126 matching lines @@
   AutofillManager::CreateForWebContentsAndDelegate(
       web_contents(), &manager_delegate);
 
   MockAutofillExternalDelegate external_delegate(web_contents());
   autocomplete_history_manager.SetExternalDelegate(&external_delegate);
 
   // Should trigger a call to OnSuggestionsReturned, verified by the mock.
   EXPECT_CALL(external_delegate, OnSuggestionsReturned(_, _, _, _, _));
   autocomplete_history_manager.SendSuggestions(NULL);
 }