| 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 e6fe9dd9e3485ecda1eb40d0e544bab91e0a5f6a..6fdb9856c67eddf0787cfa5174ba55198fc81cd8 100644
|
| --- a/chrome/browser/password_manager/password_store_win_unittest.cc
|
| +++ b/chrome/browser/password_manager/password_store_win_unittest.cc
|
| @@ -137,12 +137,13 @@ class PasswordStoreWinTest : public testing::Test {
|
| BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
|
| base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
|
| done.Wait();
|
| - MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::MessageLoop::QuitClosure());
|
| + base::MessageLoop::current()->Run();
|
| db_thread_.Stop();
|
| }
|
|
|
| - MessageLoopForUI message_loop_;
|
| + base::MessageLoopForUI message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| // PasswordStore, WDS schedule work on this thread.
|
| content::TestBrowserThread db_thread_;
|
| @@ -161,7 +162,7 @@ ACTION(STLDeleteElements0) {
|
|
|
| ACTION(QuitUIMessageLoop) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - MessageLoop::current()->Quit();
|
| + base::MessageLoop::current()->Quit();
|
| }
|
|
|
| MATCHER(EmptyWDResult, "") {
|
| @@ -234,7 +235,7 @@ TEST_F(PasswordStoreWinTest, DISABLED_ConvertIE7Login) {
|
| .WillOnce(QuitUIMessageLoop());
|
|
|
| store_->GetLogins(*form, &consumer);
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| STLDeleteElements(&forms);
|
| }
|
| @@ -267,7 +268,7 @@ TEST_F(PasswordStoreWinTest, DISABLED_OutstandingWDSQueries) {
|
| store_ = NULL;
|
| wds_ = NULL;
|
|
|
| - MessageLoop::current()->RunUntilIdle();
|
| + base::MessageLoop::current()->RunUntilIdle();
|
| }
|
|
|
| // Hangs flakily, see http://crbug.com/43836.
|
| @@ -341,8 +342,8 @@ TEST_F(PasswordStoreWinTest, DISABLED_MultipleWDSQueriesOnDifferentThreads) {
|
| // 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.
|
| - MessageLoop::current()->Run();
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| STLDeleteElements(&forms);
|
| }
|
| @@ -379,7 +380,7 @@ TEST_F(PasswordStoreWinTest, EmptyLogins) {
|
| .WillOnce(DoAll(WithArg<0>(STLDeleteElements0()), QuitUIMessageLoop()));
|
|
|
| store_->GetLogins(*form, &consumer);
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|
| TEST_F(PasswordStoreWinTest, EmptyBlacklistLogins) {
|
| @@ -401,7 +402,7 @@ TEST_F(PasswordStoreWinTest, EmptyBlacklistLogins) {
|
| .WillOnce(DoAll(WithArg<1>(STLDeleteElements0()), QuitUIMessageLoop()));
|
|
|
| store_->GetBlacklistLogins(&consumer);
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|
| TEST_F(PasswordStoreWinTest, EmptyAutofillableLogins) {
|
| @@ -423,5 +424,5 @@ TEST_F(PasswordStoreWinTest, EmptyAutofillableLogins) {
|
| .WillOnce(DoAll(WithArg<1>(STLDeleteElements0()), QuitUIMessageLoop()));
|
|
|
| store_->GetAutofillableLogins(&consumer);
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
| }
|
|
|