Remove GaiaAuthFetcher::StartCookieForOAuthCodeExchange.

google_apis/gaia/gaia_auth_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 "google_apis/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 165 matching lines @@
       oauth2_token_gurl_(GaiaUrls::GetInstance()->oauth2_token_url()),
       oauth2_revoke_gurl_(GaiaUrls::GetInstance()->oauth2_revoke_url()),
       get_user_info_gurl_(GaiaUrls::GetInstance()->get_user_info_url()),
       merge_session_gurl_(GaiaUrls::GetInstance()->merge_session_url()),
       uberauth_token_gurl_(GaiaUrls::GetInstance()->oauth1_login_url().Resolve(
           base::StringPrintf(kUberAuthTokenURLFormat, source.c_str()))),
       oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()),
       list_accounts_gurl_(GaiaUrls::GetInstance()->list_accounts_url()),
       client_login_to_oauth2_gurl_(
           GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
-      fetch_pending_(false),
-      fetch_code_only_(false) {}
+      fetch_pending_(false) {}
 
 GaiaAuthFetcher::~GaiaAuthFetcher() {}
 
 bool GaiaAuthFetcher::HasPendingFetch() {
   return fetch_pending_;
 }
 
 void GaiaAuthFetcher::CancelRequest() {
   fetcher_.reset();
   fetch_pending_ = false;
@@ skipping 339 matching lines @@
   fetcher_.reset(CreateGaiaFetcher(getter_,
                                    request_body_,
                                    std::string(),
                                    oauth2_revoke_gurl_,
                                    kLoadFlagsIgnoreCookies,
                                    this));
   fetch_pending_ = true;
   fetcher_->Start();
 }
 
-void GaiaAuthFetcher::StartCookieForOAuthCodeExchange(
-    const std::string& session_index) {
-  // Same as the first step of StartCookieForOAuthLoginTokenExchange;
-  StartCookieForOAuthLoginTokenExchange(session_index);
-  fetch_code_only_ = true;
-}
-
 void GaiaAuthFetcher::StartCookieForOAuthLoginTokenExchange(
     const std::string& session_index) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   DVLOG(1) << "Starting OAuth login token fetch with cookie jar";
   request_body_ = MakeGetAuthCodeBody();
 
   client_login_to_oauth2_gurl_ =
       GaiaUrls::GetInstance()->client_login_to_oauth2_url();
   if (!session_index.empty()) {
     client_login_to_oauth2_gurl_ =
         client_login_to_oauth2_gurl_.Resolve("?authuser=" + session_index);
   }
 
   fetcher_.reset(CreateGaiaFetcher(getter_,
                                    request_body_,
                                    std::string(),
                                    client_login_to_oauth2_gurl_,
                                    net::LOAD_NORMAL,
                                    this));
   fetch_pending_ = true;
-  fetch_code_only_ = false;
   fetcher_->Start();
 }
 
 void GaiaAuthFetcher::StartAuthCodeForOAuth2TokenExchange(
     const std::string& auth_code) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   DVLOG(1) << "Starting OAuth token pair fetch";
   request_body_ = MakeGetTokenPairBody(auth_code);
   fetcher_.reset(CreateGaiaFetcher(getter_,
@@ skipping 171 matching lines @@
 }
 
 void GaiaAuthFetcher::OnClientLoginToOAuth2Fetched(
     const std::string& data,
     const net::ResponseCookies& cookies,
     const net::URLRequestStatus& status,
     int response_code) {
   if (status.is_success() && response_code == net::HTTP_OK) {
     std::string auth_code;
     ParseClientLoginToOAuth2Response(cookies, &auth_code);
-    if (fetch_code_only_)
-      consumer_->OnClientOAuthCodeSuccess(auth_code);
-    else
-      StartAuthCodeForOAuth2TokenExchange(auth_code);
+    StartAuthCodeForOAuth2TokenExchange(auth_code);
   } else {
     GoogleServiceAuthError auth_error(GenerateAuthError(data, status));
-    if (fetch_code_only_)
-      consumer_->OnClientOAuthCodeFailure(auth_error);
-    else
-      consumer_->OnClientOAuthFailure(auth_error);
+    consumer_->OnClientOAuthFailure(auth_error);
   }
 }
 
 void GaiaAuthFetcher::OnOAuth2TokenPairFetched(
     const std::string& data,
     const net::URLRequestStatus& status,
     int response_code) {
   std::string refresh_token;
   std::string access_token;
   int expires_in_secs = 0;
@@ skipping 134 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }