[cros] Use system request context for OAuth1 access token verification

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2012 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 "ash/ash_switches.h"
 #include "base/command_line.h"
@@ skipping 184 matching lines @@
     virtual void OnUserCookiesFetchFailed(const std::string& user_name) {}
   };
 
   OAuthLoginVerifier(OAuthLoginVerifier::Delegate* delegate,
                      Profile* user_profile,
                      const std::string& oauth1_token,
                      const std::string& oauth1_secret,
                      const std::string& username)
       : delegate_(delegate),
         oauth_fetcher_(this,
-            user_profile->GetOffTheRecordProfile()->GetRequestContext(),

[Nikita (slow), 2012/04/13 12:45:55]

Zel, what was the reason why we initially were using
GetOffTheRecordProfile()->GetRequestContext() in here?

I think that using system request context is fine here.

-            user_profile->GetOffTheRecordProfile(),
-            kServiceScopeChromeOS),
+                       g_browser_process->system_request_context(),
+                       user_profile->GetOffTheRecordProfile(),
+                       kServiceScopeChromeOS),
         gaia_fetcher_(this,
-            std::string(GaiaConstants::kChromeOSSource),
-            user_profile->GetRequestContext()),
+                      std::string(GaiaConstants::kChromeOSSource),
+                      user_profile->GetRequestContext()),
         oauth1_token_(oauth1_token),
         oauth1_secret_(oauth1_secret),
         username_(username),
         user_profile_(user_profile),
         verification_count_(0),
         step_(VERIFICATION_STEP_UNVERIFIED) {
   }
   virtual ~OAuthLoginVerifier() {}
 
   bool is_done() {
@@ skipping 64 matching lines @@
   void StartCookiesRetreival() {
     DCHECK(!sid_.empty());
     DCHECK(!lsid_.empty());
     gaia_fetcher_.StartIssueAuthToken(sid_, lsid_, GaiaConstants::kGaiaService);
   }
 
   // Decides how to proceed on GAIA response and other errors. It can schedule
   // to rerun the verification process if detects transient network or service
   // errors.
   bool RetryOnError(const GoogleServiceAuthError& error) {
-    // If we can't connect to GAIA due to network or service related reasons,
-    // we should attempt OAuth token verification again.
     if (error.state() == GoogleServiceAuthError::CONNECTION_FAILED ||
-        error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
+        error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE ||
+        error.state() == GoogleServiceAuthError::REQUEST_CANCELED) {
       if (verification_count_ < kMaxOAuthTokenVerificationAttemptCount) {
         BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
             base::Bind(&OAuthLoginVerifier::ContinueVerification, AsWeakPtr()),
             kOAuthVerificationRestartDelay);
         return true;
       }
     }
     step_ = VERIFICATION_STEP_FAILED;
     return false;
   }
@@ skipping 1133 matching lines @@
 bool LoginUtils::IsWhitelisted(const std::string& username) {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(kAccountsPrefUsers, username);
 }
 
 }  // namespace chromeos