Merge 176800

chrome/browser/resources/chromeos/login/user_pod_row.js

Index: chrome/browser/resources/chromeos/login/user_pod_row.js
===================================================================
--- chrome/browser/resources/chromeos/login/user_pod_row.js	(revision 177312)
+++ chrome/browser/resources/chromeos/login/user_pod_row.js	(working copy)
@@ -57,8 +57,10 @@
    */
   var OAuthTokenStatus = {
     UNKNOWN: 0,
-    INVALID: 1,
-    VALID: 2
+    INVALID_OLD: 1,
+    VALID_OLD: 2,
+    INVALID_NEW: 3,
+    VALID_NEW: 4
   };
 
   /**
@@ -277,7 +279,8 @@
     get needGaiaSignin() {
       // Gaia signin is performed if the user has an invalid oauth token and is
       // not currently signed in (i.e. not the lock screen).
-      return this.user.oauthTokenStatus != OAuthTokenStatus.VALID &&
+      return this.user.oauthTokenStatus != OAuthTokenStatus.VALID_OLD &&
+          this.user.oauthTokenStatus != OAuthTokenStatus.VALID_NEW &&
           !this.user.signedIn;
     },
 
@@ -972,7 +975,7 @@
     resetUserOAuthTokenStatus: function(username) {
       var pod = this.getPodWithUsername_(username);
       if (pod) {
-        pod.user.oauthTokenStatus = OAuthTokenStatus.INVALID;
+        pod.user.oauthTokenStatus = OAuthTokenStatus.INVALID_OLD;
         pod.update();
       } else {
         console.log('Failed to update Gaia state for: ' + username);