Split Autofill webdata

chrome/browser/password_manager/password_store_win_unittest.cc

Index: chrome/browser/password_manager/password_store_win_unittest.cc
diff --git a/chrome/browser/password_manager/password_store_win_unittest.cc b/chrome/browser/password_manager/password_store_win_unittest.cc
index 587beb5aeca9f55a9d0e4e59eaf49e866f6671f1..84426b9da49eb886c911ec13716656a9196af8c8 100644
--- a/chrome/browser/password_manager/password_store_win_unittest.cc
+++ b/chrome/browser/password_manager/password_store_win_unittest.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/password_manager/password_store_win.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/web_database_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ -116,10 +117,12 @@ class PasswordStoreWinTest : public testing::Test {
     ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
         FILE_PATH_LITERAL("login_test"))));
     base::FilePath path = temp_dir_.path().AppendASCII("web_data_test");
-    wds_ = new WebDataService(path,
-                              WebDataServiceBase::ProfileErrorCallback());
+    wdbs_ = new WebDatabaseService(path);
     // Need to add at least one table so the database gets created.
-    wds_->AddTable(scoped_ptr<WebDatabaseTable>(new LoginsTable()));
+    wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new LoginsTable()));
+    wdbs_->LoadDatabase(WebDatabaseService::InitCallback());
+    wds_ = new WebDataService(wdbs_,
+                              WebDataServiceBase::ProfileErrorCallback());
     wds_->Init();
   }
 
@@ -127,7 +130,9 @@ class PasswordStoreWinTest : public testing::Test {
     if (store_.get())
       store_->ShutdownOnUIThread();
     wds_->ShutdownOnUIThread();
+    wdbs_->ShutdownDatabase();
     wds_ = NULL;
+    wdbs_ = NULL;
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
@@ -145,6 +150,7 @@ class PasswordStoreWinTest : public testing::Test {
   scoped_ptr<LoginDatabase> login_db_;
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<WebDataService> wds_;
+  scoped_refptr<WebDatabaseService> wdbs_;
   scoped_refptr<PasswordStore> store_;
   base::ScopedTempDir temp_dir_;
 };