Passwords: Remove references to BrowserThread from PasswordStore.

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 124 matching lines @@
     base::WaitableEvent done(false, false);
     BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     base::MessageLoop::current()->Run();
     db_thread_.Stop();
   }
 
+  PasswordStoreWin* CreatePasswordStore() {
+    return new PasswordStoreWin(
+        base::MessageLoopProxy::current(),
+        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+        login_db_.release(),
+        profile_.get(),
+        wds_.get());
+  }
+
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   // PasswordStore, WDS schedule work on this thread.
   content::TestBrowserThread db_thread_;
 
   base::ScopedTempDir temp_dir_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<LoginDatabase> login_db_;
   scoped_refptr<WebDataService> wds_;
   scoped_refptr<WebDatabaseService> wdbs_;
@@ skipping 27 matching lines @@
   // This IE7 password will be retrieved by the GetLogins call.
   wds_->AddIE7Login(password_info);
 
   // The WDS schedules tasks to run on the DB thread so we schedule yet another
   // task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
 
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init());
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResults(_))
       .WillByDefault(QuitUIMessageLoop());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
@@ skipping 30 matching lines @@
       .WillOnce(QuitUIMessageLoop());
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
 
   STLDeleteElements(&forms);
 }
 
 // Crashy.  http://crbug.com/86558
 TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
@@ skipping 22 matching lines @@
                                     &password_info));
   wds_->AddIE7Login(password_info);
 
   // The WDS schedules tasks to run on the DB thread so we schedule yet another
   // task to notify us that it's safe to carry on with the test.
   WaitableEvent done(false, false);
   BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
       base::Bind(&WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
 
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   EXPECT_TRUE(store_->Init());
 
   MockPasswordStoreConsumer password_consumer;
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(password_consumer, OnGetPasswordStoreResults(_))
       .WillByDefault(QuitUIMessageLoop());
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
@@ skipping 41 matching lines @@
   // Run the MessageLoop twice: once for the GetIE7Login that PasswordStoreWin
   // schedules on the DB thread and once for the one we just scheduled on the UI
   // thread.
   base::MessageLoop::current()->Run();
   base::MessageLoop::current()->Run();
 
   STLDeleteElements(&forms);
 }
 
 TEST_F(PasswordStoreWinTest, EmptyLogins) {
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   store_->Init();
 
   PasswordFormData form_data = {
     PasswordForm::SCHEME_HTML,
     "http://example.com/",
     "http://example.com/origin",
     "http://example.com/action",
     L"submit_element",
     L"username_element",
     L"password_element",
@@ skipping 13 matching lines @@
   // expect that we get no results;
   EXPECT_CALL(consumer,
               OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
       .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
 
   store_->GetLogins(*form, PasswordStore::DISALLOW_PROMPT, &consumer);
   base::MessageLoop::current()->Run();
 }
 
 TEST_F(PasswordStoreWinTest, EmptyBlacklistLogins) {
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   store_->Init();
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResults(_))
       .WillByDefault(QuitUIMessageLoop());
 
   VectorOfForms expect_none;
   // expect that we get no results;
   EXPECT_CALL(
       consumer,
       OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
       .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
 
   store_->GetBlacklistLogins(&consumer);
   base::MessageLoop::current()->Run();
 }
 
 TEST_F(PasswordStoreWinTest, EmptyAutofillableLogins) {
-  store_ = new PasswordStoreWin(login_db_.release(), profile_.get(),
-                                wds_.get());
+  store_ = CreatePasswordStore();
   store_->Init();
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnGetPasswordStoreResults(_))
       .WillByDefault(QuitUIMessageLoop());
 
   VectorOfForms expect_none;
   // expect that we get no results;
   EXPECT_CALL(
       consumer,
       OnGetPasswordStoreResults(ContainsAllPasswordForms(expect_none)))
       .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
 
   store_->GetAutofillableLogins(&consumer);
   base::MessageLoop::current()->Run();
 }