Fix device policy recovery on CrOS login

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 5d05eefb8ed61848a2fa485d0ef224f202c55615..21e4cb77c98956100556f2466594377d5bf9a3fb 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -462,12 +462,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
   }
 
   virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
-    // Map ChromeOS specific LOGGED_IN states to Ash LOGGED_IN states.
-    LoginState::LoggedInState state = LoginState::Get()->GetLoggedInState();
-    if (state == LoginState::LOGGED_IN_OOBE ||
-        state == LoginState::LOGGED_IN_NONE) {
+    // All non-logged in ChromeOS specific LOGGED_IN states map to the same
+    // Ash specific LOGGED_IN state.
+    if (!LoginState::Get()->IsUserLoggedIn())
       return ash::user::LOGGED_IN_NONE;
-    }
+
     if (screen_locked_)
       return ash::user::LOGGED_IN_LOCKED;
 
@@ -497,7 +496,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
 
   virtual bool IsOobeCompleted() const OVERRIDE {
     if (!base::chromeos::IsRunningOnChromeOS() &&
-        LoginState::Get()->GetLoggedInState() == LoginState::LOGGED_IN_ACTIVE)
+        LoginState::Get()->IsUserLoggedIn())
       return true;
     return StartupUtils::IsOobeCompleted();
   }