Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More test fixing... Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 fff19616da6c640dc3ff991e67a36cba4ae48a8d..904e774a1bc75022c090f892950b59493cb1b874 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
#include "chrome/browser/chromeos/login/authenticator.h"
+#include "chrome/browser/chromeos/login/device_settings_test_helper.h"
#include "chrome/browser/chromeos/login/login_status_consumer.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/io_thread.h"
@@ -290,9 +291,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(_, _, _, _))
@@ -306,6 +308,7 @@ class LoginUtilsTest : public testing::Test,
LoginUtils::Get()->PrepareProfile(username, std::string(), "password",
false, true, false, this);
+ device_settings_test_helper.Flush();
RunAllPending();
}

Powered by Google App Engine
This is Rietveld 408576698