[ChromeOS] Fix a problem that invalid oauth token is not refreshed.

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 480 matching lines @@
       // put in place that will ensure that the newly created session is
       // authenticated for the websites that work with the used authentication
       // schema.
       if (!TransferDefaultCookies(authenticator_->authentication_profile(),
                                   user_profile)) {
         LOG(WARNING) << "Cookie transfer from the default profile failed!";
       }
     }
     std::string oauth1_token;
     std::string oauth1_secret;
-    if (!has_cookies_ &&
-        ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret)) {
-      // Verify OAuth access token when we find it in the profile and no cookies
-      // available because user is not signing in using extension.
+    if (ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret) ||
+        !has_cookies_) {
+      // Verify OAuth access token when we find it in the profile and always if
+      // if we don't have cookies.
       authenticator_->VerifyOAuth1AccessToken(oauth1_token, oauth1_secret);
     } else {
       // If we don't have it, fetch OAuth1 access token.
       // Use off-the-record profile that was used for this step. It should
       // already contain all needed cookies that will let us skip GAIA's user
       // authentication UI.
       //
       // TODO(rickcam) We should use an isolated App here.
       FetchOAuth1AccessToken(authenticator_->authentication_profile());
     }
@@ skipping 483 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos