Second try at splitting WebDataService (minus ownership changes)

chrome/browser/webdata/web_data_service_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 59 matching lines @@
   WebDataServiceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
  protected:
   virtual void SetUp() {
     db_thread_.Start();
 
     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() {
     wds_->ShutdownOnUIThread();
     wds_ = NULL;
     WaitForDatabaseThread();
 
     db_thread_.Stop();
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
@@ skipping 448 matching lines @@
   EXPECT_EQ(handle2, profile_consumer2.handle());
   ASSERT_EQ(0U, profile_consumer2.result().size());
 
   // Check that the credit card was removed.
   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2;
   handle2 = wds_->GetCreditCards(&card_consumer2);
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }