Move AutofillWebData DB methods into separate class

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/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/webdata/web_data_service_factory.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 "components/autofill/browser/autocomplete_history_manager.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/common/form_data.h"
 #include "components/webdata/common/web_data_service_test_util.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"
 
 using content::BrowserThread;
 using content::WebContents;
 using testing::_;
 
 namespace autofill {
 
 namespace {
 
 class MockWebDataService : public AutofillWebDataService {
  public:
   MockWebDataService()
-      : AutofillWebDataService(
-            NULL, WebDataServiceBase::ProfileErrorCallback()) {
+      : AutofillWebDataService() {
     current_mock_web_data_service_ = this;
   }
 
   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_;
@@ skipping 42 matching lines @@
 }  // namespace
 
 class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   AutocompleteHistoryManagerTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {
   }
 
   virtual void SetUp() OVERRIDE {
+    db_thread_.Start();
     ChromeRenderViewHostTestHarness::SetUp();
     web_data_service_ = new MockWebDataService();
     WebDataServiceFactory::GetInstance()->SetTestingFactory(
         profile(), MockWebDataServiceWrapperCurrent::Build);
     autocomplete_manager_.reset(new AutocompleteHistoryManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     autocomplete_manager_.reset();
     web_data_service_ = NULL;
     ChromeRenderViewHostTestHarness::TearDown();
+    base::WaitableEvent done(false, false);
+    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+    done.Wait();
+    db_thread_.Stop();

[Ilya Sherman, 2013/04/30 00:14:08]

Hmm, can you just use content::RunAllPendingInMessageLoop() from
//contents/public/test/test_utils.h?

[Cait (Slow), 2013/04/30 22:24:40]

Done.

     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;
 };
@@ skipping 133 matching lines @@
 
   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);
 }
 
 }  // namespace autofill