Fixed OAuth2 policy fetching retry logic.

chrome/browser/chromeos/login/oauth2_policy_fetcher.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/oauth2_policy_fetcher.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 20 matching lines @@
 const int kRequestRestartDelay = 3000;
 
 const char kServiceScopeChromeOSDeviceManagement[] =
     "https://www.googleapis.com/auth/chromeosdevicemanagement";
 
 }  // namespace
 
 OAuth2PolicyFetcher::OAuth2PolicyFetcher(
     net::URLRequestContextGetter* auth_context_getter,
     net::URLRequestContextGetter* system_context_getter)
-    : refresh_token_fetcher_(
-          new GaiaAuthFetcher(this,
-                              GaiaConstants::kChromeSource,
-                              auth_context_getter)),
-      access_token_fetcher_(
-          new OAuth2AccessTokenFetcher(this, system_context_getter)),
+    : auth_context_getter_(auth_context_getter),
+      system_context_getter_(system_context_getter),
       retry_count_(0),
       failed_(false) {
 }
 
 OAuth2PolicyFetcher::OAuth2PolicyFetcher(
     net::URLRequestContextGetter* system_context_getter,
     const std::string& oauth2_refresh_token)
-    : access_token_fetcher_(
-          new OAuth2AccessTokenFetcher(this, system_context_getter)),
+    : system_context_getter_(system_context_getter),
       oauth2_refresh_token_(oauth2_refresh_token),
       retry_count_(0),
       failed_(false) {
 }
 
 OAuth2PolicyFetcher::~OAuth2PolicyFetcher() {
 }
 
 void OAuth2PolicyFetcher::Start() {
   retry_count_ = 0;
   if (oauth2_refresh_token_.empty()) {
     StartFetchingRefreshToken();
   } else {
     StartFetchingAccessToken();
   }
 }
 
 void OAuth2PolicyFetcher::StartFetchingRefreshToken() {
   DCHECK(refresh_token_fetcher_.get());
+  refresh_token_fetcher_.reset(
+            new GaiaAuthFetcher(this,
+                                GaiaConstants::kChromeSource,
+                                auth_context_getter_));
   refresh_token_fetcher_->StartCookieForOAuthLoginTokenExchange(EmptyString());
 }
 
 void OAuth2PolicyFetcher::StartFetchingAccessToken() {
   std::vector<std::string> scopes;
   scopes.push_back(kServiceScopeChromeOSDeviceManagement);
+  access_token_fetcher_.reset(
+      new OAuth2AccessTokenFetcher(this, system_context_getter_));
   access_token_fetcher_->Start(
       GaiaUrls::GetInstance()->oauth2_chrome_client_id(),
       GaiaUrls::GetInstance()->oauth2_chrome_client_secret(),
       oauth2_refresh_token_,
       scopes);
 }
 
 void OAuth2PolicyFetcher::OnClientOAuthSuccess(
     const GaiaAuthConsumer::ClientOAuthResult& oauth2_tokens) {
   LOG(INFO) << "OAuth2 tokens for policy fetching succeeded.";
@@ skipping 55 matching lines @@
       browser_policy_connector->GetUserCloudPolicyManager();
   if (cloud_policy_manager) {
     if (token.empty())
       cloud_policy_manager->CancelWaitForPolicyFetch();
     else
       cloud_policy_manager->RegisterClient(token);
   }
 }
 
 }  // namespace chromeos