Second try at splitting WebDataService (minus ownership changes)

chrome/browser/password_manager/password_store_win_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 <windows.h>
 #include <wincrypt.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 97 matching lines @@
   virtual void SetUp() {
     ASSERT_TRUE(db_thread_.Start());
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     profile_.reset(new TestingProfile());
 
     login_db_.reset(new LoginDatabase());
     ASSERT_TRUE(login_db_->Init(temp_dir_.path().Append(
         FILE_PATH_LITERAL("login_test"))));
     wds_ = new WebDataService();
-    ASSERT_TRUE(wds_->Init(temp_dir_.path()));
+    base::FilePath path = temp_dir_.path().AppendASCII("web_data_test");
+    wds_->Init(path);
   }
 
   virtual void TearDown() {
     if (store_.get())
       store_->ShutdownOnUIThread();
     wds_->ShutdownOnUIThread();
     wds_ = NULL;
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
@@ skipping 278 matching lines @@
   VectorOfForms expect_none;
   // expect that we get no results;
   EXPECT_CALL(
       consumer,
       OnPasswordStoreRequestDone(_, ContainsAllPasswordForms(expect_none)))
       .WillOnce(DoAll(WithArg<1>(STLDeleteElements0()), QuitUIMessageLoop()));
 
   store_->GetAutofillableLogins(&consumer);
   MessageLoop::current()->Run();
 }