Make WebDataService no longer depend on ProfileKeyedService

components/autofill/browser/autocomplete_history_manager_unittest.cc

Index: components/autofill/browser/autocomplete_history_manager_unittest.cc
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc
index be8e8755d16ea31b82812b4b115b841b1e01ba43..0af1b93a51659c0432768acba451d0ff9386bf6b 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -36,14 +36,15 @@ class MockWebDataService : public WebDataService {
     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() {}
 
@@ -55,6 +56,27 @@ class MockWebDataService : public WebDataService {
 
 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:
@@ -73,14 +95,15 @@ class MockAutofillManagerDelegate
 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()));
   }
 
@@ -88,8 +111,11 @@ class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
     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_;