Move AutofillWebData DB methods into separate class

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 7b308dc349c64236dd111c0c63e63e016f000447..5764335040bce7648969cfe91ad49b7b947787b3 100644
--- a/components/autofill/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc
@@ -7,6 +7,7 @@
 #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"
@@ -35,8 +36,7 @@ namespace {
 class MockWebDataService : public AutofillWebDataService {
  public:
   MockWebDataService()
-      : AutofillWebDataService(
-            NULL, WebDataServiceBase::ProfileErrorCallback()) {
+      : AutofillWebDataService() {
     current_mock_web_data_service_ = this;
   }
 
@@ -99,6 +99,7 @@ class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
   }
 
   virtual void SetUp() OVERRIDE {
+    db_thread_.Start();
     ChromeRenderViewHostTestHarness::SetUp();
     web_data_service_ = new MockWebDataService();
     WebDataServiceFactory::GetInstance()->SetTestingFactory(
@@ -110,6 +111,11 @@ class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
     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();
 
   }