Addressing comments from msw and rsleevi for the following patch which is

chrome/common/net/gaia/oauth2_api_call_flow.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/common/net/gaia/oauth2_api_call_flow.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
     const std::string& access_token,
     const std::vector<std::string>& scopes)
     : context_(context),
       refresh_token_(refresh_token),
       access_token_(access_token),
       scopes_(scopes),
       state_(INITIAL),
       tried_mint_access_token_(false) {
 }
 
-OAuth2ApiCallFlow::~OAuth2ApiCallFlow() { }
+OAuth2ApiCallFlow::~OAuth2ApiCallFlow() {}
 
 void OAuth2ApiCallFlow::Start() {
   BeginApiCall();
 }
 
 void OAuth2ApiCallFlow::BeginApiCall() {
   CHECK(state_ == INITIAL || state_ == MINT_ACCESS_TOKEN_DONE);
 
   // If the access token is empty then directly try to mint one.
   if (access_token_.empty()) {
     BeginMintAccessToken();
-    return;
   } else {
     state_ = API_CALL_STARTED;
-
     url_fetcher_.reset(CreateURLFetcher());
     url_fetcher_->Start();  // OnURLFetchComplete will be called.
   }
 }
 
 void OAuth2ApiCallFlow::EndApiCall(const URLFetcher* source) {
   CHECK_EQ(API_CALL_STARTED, state_);
   state_ = API_CALL_DONE;
 
   URLRequestStatus status = source->GetStatus();
   if (!status.is_success()) {
+    state_ = ERROR_STATE;
     ProcessApiCallFailure(source);
     return;
   }
 
   // If the response code is 401 Unauthorized then access token may have
   // expired. So try generating a new access token.
   if (source->GetResponseCode() == net::HTTP_UNAUTHORIZED) {
     // If we already tried minting a new access token, don't do it again.
-    if (tried_mint_access_token_)
+    if (tried_mint_access_token_) {
+      state_ = ERROR_STATE;
       ProcessApiCallFailure(source);
-    else
+    } else {
       BeginMintAccessToken();
+    }
 
     return;
   }
 
   if (source->GetResponseCode() != net::HTTP_OK) {
+    state_ = ERROR_STATE;
     ProcessApiCallFailure(source);
     return;
   }
 
   ProcessApiCallSuccess(source);
 }
 
 void OAuth2ApiCallFlow::BeginMintAccessToken() {
   CHECK(state_ == INITIAL || state_ == API_CALL_DONE);
   CHECK(!tried_mint_access_token_);
@@ skipping 52 matching lines @@
 
   result->SetRequestContext(context_);
   result->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                        net::LOAD_DO_NOT_SAVE_COOKIES);
 
   if (!empty_body)
     result->SetUploadData("application/x-www-form-urlencoded", body);
 
   return result;
 }