| Index: chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
|
| diff --git a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
|
| index bb7339c68588d86d6d1879715a0d19fe502e6595..ce3837ad224ac6c0ba5a1fd38a23c3c4b145664d 100644
|
| --- a/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
|
| +++ b/chrome/browser/password_manager/password_store_proxy_mac_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/run_loop.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/test/histogram_tester.h"
|
| @@ -181,7 +182,7 @@ void PasswordStoreProxyMacTest::FinishAsyncProcessing() {
|
| store_->GetLogins(PasswordForm(), &consumer);
|
| EXPECT_CALL(consumer, OnGetPasswordStoreResultsConstRef(_))
|
| .WillOnce(QuitUIMessageLoop());
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| }
|
|
|
| base::FilePath PasswordStoreProxyMacTest::test_login_db_file_path() const {
|
| @@ -318,19 +319,19 @@ TEST_P(PasswordStoreProxyMacTest, FillLogins) {
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(
|
| ElementsAre(Pointee(password_form))))
|
| .WillOnce(QuitUIMessageLoop());
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| store()->GetBlacklistLogins(&mock_consumer);
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(
|
| ElementsAre(Pointee(blacklisted_form))))
|
| .WillOnce(QuitUIMessageLoop());
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| store()->GetAutofillableLogins(&mock_consumer);
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(
|
| ElementsAre(Pointee(password_form))))
|
| .WillOnce(QuitUIMessageLoop());
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
| }
|
|
|
| TEST_P(PasswordStoreProxyMacTest, OperationsOnABadDatabaseSilentlyFail) {
|
| @@ -369,15 +370,15 @@ TEST_P(PasswordStoreProxyMacTest, OperationsOnABadDatabaseSilentlyFail) {
|
| ON_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(_))
|
| .WillByDefault(QuitUIMessageLoop());
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| store()->GetAutofillableLogins(&mock_consumer);
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| store()->GetBlacklistLogins(&mock_consumer);
|
| EXPECT_CALL(mock_consumer, OnGetPasswordStoreResultsConstRef(IsEmpty()));
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| // Report metrics.
|
| store()->ReportMetrics("Test Username", true);
|
| @@ -462,7 +463,7 @@ void PasswordStoreProxyMacMigrationTest::TestMigration(bool lock_keychain) {
|
| EXPECT_CALL(mock_consumer,
|
| OnGetPasswordStoreResultsConstRef(ElementsAre(Pointee(form))))
|
| .WillOnce(QuitUIMessageLoop());
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| int status = testing_prefs_.GetInteger(
|
| password_manager::prefs::kKeychainMigrationStatus);
|
|
|