Wait for URLBlacklist update tasks on automation tests.

chrome/browser/password_manager/password_store_win_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 #include <wincrypt.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
-#include "base/synchronization/waitable_event.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #include "chrome/browser/password_manager/password_form_data.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/password_manager/password_store_win.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/test/base/signaling_task.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::WaitableEvent;
 using testing::_;
 using testing::DoAll;
 using testing::WithArg;
 using webkit_glue::PasswordForm;
 
 namespace {
 
 class MockPasswordStoreConsumer : public PasswordStoreConsumer {
  public:
   MOCK_METHOD2(OnPasswordStoreRequestDone,
@@ skipping 115 matching lines @@
                                     &password_info));
   // Verify the URL hash
   ASSERT_EQ(L"39471418FF5453FEEB3731E382DEB5D53E14FAF9B5",
             password_info.url_hash);
 
   // 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,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Prentend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                             true,
                                             PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStore> store(
       new PasswordStoreWin(login_db_.release(), profile_.get(), wds_.get()));
   EXPECT_TRUE(store->Init());
@@ skipping 88 matching lines @@
 // Hangs flakily, see http://crbug.com/43836.
 TEST_F(PasswordStoreWinTest, DISABLED_MultipleWDSQueriesOnDifferentThreads) {
   IE7PasswordInfo password_info;
   ASSERT_TRUE(CreateIE7PasswordInfo(L"http://example.com/origin",
                                     base::Time::FromDoubleT(1),
                                     &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,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Prentend that the migration has already taken place.
   profile_->GetPrefs()->RegisterBooleanPref(prefs::kLoginDatabaseMigrated,
                                             true,
                                             PrefService::UNSYNCABLE_PREF);
 
   // Initializing the PasswordStore shouldn't trigger a migration.
   scoped_refptr<PasswordStore> store(
       new PasswordStoreWin(login_db_.release(), profile_.get(), wds_.get()));
   EXPECT_TRUE(store->Init());
@@ skipping 132 matching lines @@
        it != expected_autofillable.end(); ++it) {
     wds_->AddLogin(**it);
   }
   for (VectorOfForms::iterator it = expected_blacklisted.begin();
        it != expected_blacklisted.end(); ++it) {
     wds_->AddLogin(**it);
   }
 
   // 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,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Initializing the PasswordStore should trigger a migration.
   scoped_refptr<PasswordStore> store(
       new PasswordStoreWin(login_db_.release(), profile_.get(), wds_.get()));
   store->Init();
 
   // Check that the migration preference has not been initialized;
   ASSERT_TRUE(NULL == profile_->GetPrefs()->FindPreference(
       prefs::kLoginDatabaseMigrated));
 
   // Again, the WDS schedules tasks to run on the DB thread, so schedule a task
   // to signal us when it is safe to continue.
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Let the WDS callbacks proceed so the logins can be migrated.
   MessageLoop::current()->RunAllPending();
 
   MockPasswordStoreConsumer consumer;
 
   // Make sure we quit the MessageLoop even if the test fails.
   ON_CALL(consumer, OnPasswordStoreRequestDone(_, _))
       .WillByDefault(QuitUIMessageLoop());
 
@@ skipping 22 matching lines @@
 
   MockWebDataServiceConsumer wds_consumer;
 
   // No autofillable logins should be left in the WDS.
   EXPECT_CALL(wds_consumer,
       OnWebDataServiceRequestDone(_, EmptyWDResult()));
 
   wds_->GetAutofillableLogins(&wds_consumer);
 
   // Wait for the WDS methods to execute on the DB thread.
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Handle the callback from the WDS.
   MessageLoop::current()->RunAllPending();
 
   // Likewise, no blacklisted logins should be left in the WDS.
   EXPECT_CALL(wds_consumer,
       OnWebDataServiceRequestDone(_, EmptyWDResult()));
 
   wds_->GetBlacklistLogins(&wds_consumer);
 
   // Wait for the WDS methods to execute on the DB thread.
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      new SignalingTask(&done));
-  done.Wait();
+  CHECK(BrowserThread::WaitForPendingTasksOn(BrowserThread::DB));
 
   // Handle the callback from the WDS.
   MessageLoop::current()->RunAllPending();
 
   STLDeleteElements(&expected_autofillable);
   STLDeleteElements(&expected_blacklisted);
 }
 
 TEST_F(PasswordStoreWinTest, EmptyLogins) {
   scoped_refptr<PasswordStore> store(
@@ skipping 70 matching lines @@
   // 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();
 
   store->Shutdown();
 }