| Index: chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| index dcb2e87ab9ba845dbc6bbe67532b317fca1925d0..2cd97269b6b0187167e478ea203d223eeacf8fd3 100644
|
| --- a/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/parallel_authenticator_unittest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
|
| #include "chrome/browser/chromeos/cros_settings.h"
|
| #include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
|
| +#include "chrome/browser/chromeos/login/device_settings_test_helper.h"
|
| #include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
|
| #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
|
| #include "chrome/browser/chromeos/login/mock_user_manager.h"
|
| @@ -34,13 +35,13 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| -using content::BrowserThread;
|
| using ::testing::AnyNumber;
|
| using ::testing::DoAll;
|
| using ::testing::Invoke;
|
| using ::testing::Return;
|
| using ::testing::SetArgPointee;
|
| using ::testing::_;
|
| +using content::BrowserThread;
|
|
|
| namespace chromeos {
|
|
|
| @@ -208,8 +209,10 @@ class ParallelAuthenticatorTest : public testing::Test {
|
| std::string password_;
|
| std::string hash_ascii_;
|
|
|
| + ScopedDeviceSettingsTestHelper device_settings_test_helper_;
|
| +
|
| // Initializes / shuts down a stub CrosLibrary.
|
| - chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
|
| + ScopedStubCrosEnabler stub_cros_enabler_;
|
|
|
| // Mocks, destroyed by CrosLibrary class.
|
| MockCertLibrary* mock_cert_library_;
|
| @@ -338,8 +341,8 @@ TEST_F(ParallelAuthenticatorTest, ResolveOwnerNeededFailedMount) {
|
|
|
| EXPECT_EQ(ParallelAuthenticator::CONTINUE,
|
| SetAndResolveState(auth_, state_.release()));
|
| - // Let the owner verification run on the FILE thread...
|
| - message_loop_.RunAllPending();
|
| + // Let the owner verification run.
|
| + device_settings_test_helper_.Flush();
|
| // and test that the mount has succeeded.
|
| state_.reset(new TestAttemptState(username_,
|
| password_,
|
|
|