| Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| index 2c2ed0f904c4025e3a2c9aee0eb2ca89432c2dc8..97046c728710668b28163b48e6aa05735a25aa69 100644
|
| --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/chromeos/login/authenticator.h"
|
| #include "chrome/browser/chromeos/login/login_status_consumer.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| +#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
|
| #include "chrome/browser/io_thread.h"
|
| #include "chrome/browser/net/predictor.h"
|
| #include "chrome/browser/policy/browser_policy_connector.h"
|
| @@ -287,9 +288,10 @@ class LoginUtilsTest : public testing::Test,
|
| }
|
|
|
| void PrepareProfile(const std::string& username) {
|
| - MockSessionManagerClient* session_managed_client =
|
| + ScopedDeviceSettingsTestHelper device_settings_test_helper;
|
| + MockSessionManagerClient* session_manager_client =
|
| mock_dbus_thread_manager_.mock_session_manager_client();
|
| - EXPECT_CALL(*session_managed_client, StartSession(_));
|
| + EXPECT_CALL(*session_manager_client, StartSession(_));
|
| EXPECT_CALL(*cryptohome_, GetSystemSalt())
|
| .WillRepeatedly(Return(std::string("stub_system_salt")));
|
| EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
|
| @@ -303,6 +305,7 @@ class LoginUtilsTest : public testing::Test,
|
|
|
| LoginUtils::Get()->PrepareProfile(username, std::string(), "password",
|
| false, true, false, this);
|
| + device_settings_test_helper.Flush();
|
| RunAllPending();
|
| }
|
|
|
|
|