Second try at splitting WebDataService (minus ownership changes)

chrome/browser/webdata/web_data_service_unittest.cc

Index: chrome/browser/webdata/web_data_service_unittest.cc
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 08b7b7b7549348f15ef4f7221cd87a225eebdf24..c61882f0caf874ccdec29d34adf631bf024c7b16 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -77,7 +77,8 @@ class WebDataServiceTest : public testing::Test {
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     wds_ = new WebDataService();
-    wds_->Init(temp_dir_.path());
+    base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB");
+    wds_->Init(path);
   }
 
   virtual void TearDown() {
@@ -85,9 +86,9 @@ class WebDataServiceTest : public testing::Test {
     wds_ = NULL;
     WaitForDatabaseThread();
 
-    db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
+    db_thread_.Stop();
   }
 
   void WaitForDatabaseThread() {