Fix device policy recovery on CrOS login

chromeos/login/login_state_unittest.cc

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..46e24caf99dd4241162d784d43346f837aa68f41 100644
--- a/chromeos/login/login_state_unittest.cc
+++ b/chromeos/login/login_state_unittest.cc
@@ -16,9 +16,7 @@ namespace chromeos {
 class LoginStateTest : public testing::Test,
                        public LoginState::Observer {
  public:
-  LoginStateTest()
-      : logged_in_state_(LoginState::LOGGED_IN_OOBE),
-        logged_in_user_type_(LoginState::LOGGED_IN_USER_NONE) {
+  LoginStateTest() : logged_in_user_type_(LoginState::LOGGED_IN_USER_NONE) {
   }
   virtual ~LoginStateTest() {
   }
@@ -39,14 +37,12 @@ class LoginStateTest : public testing::Test,
   }
 
   // LoginState::Observer
-  virtual void LoggedInStateChanged(LoginState::LoggedInState state) OVERRIDE {
-    logged_in_state_ = state;
+  virtual void LoggedInStateChanged() OVERRIDE {

[stevenjb, 2013/09/12 00:48:01]

We should explicitly track that the observer gets triggered here, and test for
that explicitly, instead of just relying on logged_in_user_type_ getting set
correctly.

[tbarzic, 2013/09/12 01:18:12]

Done.

     logged_in_user_type_ = LoginState::Get()->GetLoggedInUserType();
   }
 
  protected:
   base::MessageLoopForUI message_loop_;
-  LoginState::LoggedInState logged_in_state_;
   LoginState::LoggedInUserType logged_in_user_type_;
 
  private:
@@ -54,23 +50,34 @@ class LoginStateTest : public testing::Test,
 };
 
 TEST_F(LoginStateTest, TestLoginState) {
-  EXPECT_EQ(LoginState::LOGGED_IN_OOBE, logged_in_state_);
-  EXPECT_EQ(LoginState::LOGGED_IN_OOBE, LoginState::Get()->GetLoggedInState());
+  EXPECT_FALSE(LoginState::Get()->IsUserLoggedIn());
+  EXPECT_FALSE(LoginState::Get()->IsInSafeMode());
   EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, logged_in_user_type_);
   EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE,
             LoginState::Get()->GetLoggedInUserType());
+  // Setting login state to SAFE MODE.

[stevenjb, 2013/09/12 00:48:01]

We should probably test safe mode separately, since normally LoginState won't go
-> SAFE -> ACTIVE, i.e. we should test going -> ACTIVE directly.

[tbarzic, 2013/09/12 01:18:12]

Done.

+  LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_SAFE_MODE,
+                                      LoginState::LOGGED_IN_USER_NONE);
+  EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE,
+            LoginState::Get()->GetLoggedInUserType());
+  EXPECT_FALSE(LoginState::Get()->IsUserLoggedIn());
+  EXPECT_TRUE(LoginState::Get()->IsInSafeMode());
+
+  // Run the message loop, observer should update members.
+  message_loop_.RunUntilIdle();
+  EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, logged_in_user_type_);
+
   // Setting login state to ACTIVE.
   LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_ACTIVE,
-                                      LoginState::LOGGED_IN_USER_REGULAR);
-  EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE,
-            LoginState::Get()->GetLoggedInState());
-  EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR,
+                                      LoginState::LOGGED_IN_USER_OWNER);
+  EXPECT_EQ(LoginState::LOGGED_IN_USER_OWNER,
             LoginState::Get()->GetLoggedInUserType());
   EXPECT_TRUE(LoginState::Get()->IsUserLoggedIn());
+  EXPECT_FALSE(LoginState::Get()->IsInSafeMode());
+
   // 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_);
+  EXPECT_EQ(LoginState::LOGGED_IN_USER_OWNER, logged_in_user_type_);
 }
 
-}  // namespace
+}  // namespace chromeos