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

Unified Diff: chromeos/login/login_state_unittest.cc

Issue 24072006: Return correct window when user is logged in but before session is started. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test compile error Created 7 years, 3 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: chromeos/login/login_state_unittest.cc
diff --git a/chromeos/login/login_state_unittest.cc b/chromeos/login/login_state_unittest.cc
index 0665745aa69fb36a9d9491ace3a03430fd7d7086..114b53e277ee95c55df7af8680dba9ae158e01e7 100644
--- a/chromeos/login/login_state_unittest.cc
+++ b/chromeos/login/login_state_unittest.cc
@@ -59,6 +59,7 @@ TEST_F(LoginStateTest, TestLoginState) {
EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, logged_in_user_type_);
EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE,
LoginState::Get()->GetLoggedInUserType());
+ EXPECT_FALSE(LoginState::Get()->IsSessionStarted());
// Setting login state to ACTIVE.
LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_ACTIVE,
LoginState::LOGGED_IN_USER_REGULAR);
@@ -67,10 +68,13 @@ TEST_F(LoginStateTest, TestLoginState) {
EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR,
LoginState::Get()->GetLoggedInUserType());
EXPECT_TRUE(LoginState::Get()->IsUserLoggedIn());
+ // Set session started.
+ LoginState::Get()->SetSessionStarted(true);
+ EXPECT_TRUE(LoginState::Get()->IsSessionStarted());
// Run the message loop, observer should update members.
message_loop_.RunUntilIdle();
EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE, logged_in_state_);
EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR, logged_in_user_type_);
}
-} // namespace
+} // namespace chromeos
« chrome/browser/chromeos/login/user_manager_impl.cc ('K') | « chromeos/login/login_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698