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 c3fe71f26358a98dd765ca2da0146368fa14e05d..4105e2c9e7dc184dd2e3260c9c56ebbbb1e5b0e0 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -469,12 +469,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;
 
@@ -504,7 +503,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();
   }
@@ -1080,8 +1079,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
   }
 
   // LoginState::Observer overrides.
-  virtual void LoggedInStateChanged(
-      chromeos::LoginState::LoggedInState state) OVERRIDE {
+  virtual void LoggedInStateChanged() OVERRIDE {
     UpdateClockType();
   }