Remove support for ClientOAuth from GaiaAuthFetcher.

google_apis/gaia/gaia_auth_fetcher.h

 // 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.
 
 #ifndef GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 #define GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 129 matching lines @@
   void StartMergeSession(const std::string& uber_token);
 
   // Start a request to exchange an OAuthLogin-scoped oauth2 access token for an
   // uber-auth token.  The returned token can be used with the method
   // StartMergeSession().
   //
   // Either OnUberAuthTokenSuccess or OnUberAuthTokenFailure will be
   // called on the consumer on the original thread.
   void StartTokenFetchForUberAuthExchange(const std::string& access_token);
 
-  // Start a request to obtain an OAuth2 token for the account identified by
-  // |username| and |password|.  |scopes| is a list of oauth scopes that
-  // indicate the access permerssions to assign to the returned token.
-  // |persistent_id| is an optional client identifier used to identify this
-  // particular chrome instances, which may reduce the chance of a challenge.
-  // |locale| will be used to format messages to be presented to the user in
-  // challenges, if needed.
-  //
-  // If the request cannot complete due to a challenge, the
-  // GoogleServiceAuthError will indicate the type of challenge required:
-  // either CAPTCHA_REQUIRED or TWO_FACTOR.
-  //
-  // Either OnClientOAuthSuccess or OnClientOAuthFailure will be
-  // called on the consumer on the original thread.
-  void StartClientOAuth(const std::string& username,
-                        const std::string& password,
-                        const std::vector<std::string>& scopes,
-                        const std::string& persistent_id,
-                        const std::string& locale);
-
-  // Start a challenge response to obtain an OAuth2 token.  This method is
-  // called after a challenge response is issued from a previous call to
-  // StartClientOAuth().  The |type| and |token| arguments come from the
-  // error response to StartClientOAuth(), while the |solution| argument
-  // represents the answer from the user for the partocular challenge.
-  //
-  // Either OnClientOAuthSuccess or OnClientOAuthFailure will be
-  // called on the consumer on the original thread.
-  void StartClientOAuthChallengeResponse(GoogleServiceAuthError::State type,
-                                         const std::string& token,
-                                         const std::string& solution);
-
   // Start a request to exchange an OAuthLogin-scoped oauth2 access token for a
   // ClientLogin-style service tokens.  The response to this request is the
   // same as the response to a ClientLogin request, except that captcha
   // challenges are never issued.
   //
   // Either OnClientLoginSuccess or OnClientLoginFailure will be
   // called on the consumer on the original thread. If |service| is empty,
   // the call will attempt to fetch uber auth token.
   void StartOAuthLogin(const std::string& access_token,
                        const std::string& service);
@@ skipping 98 matching lines @@
                             int response_code);
 
   void OnMergeSessionFetched(const std::string& data,
                              const net::URLRequestStatus& status,
                              int response_code);
 
   void OnUberAuthTokenFetch(const std::string& data,
                             const net::URLRequestStatus& status,
                             int response_code);
 
-  void OnClientOAuthFetched(const std::string& data,
-                            const net::URLRequestStatus& status,
-                            int response_code);
-
   void OnOAuthLoginFetched(const std::string& data,
                            const net::URLRequestStatus& status,
                            int response_code);
 
   // Tokenize the results of a ClientLogin fetch.
   static void ParseClientLoginResponse(const std::string& data,
                                        std::string* sid,
                                        std::string* lsid,
                                        std::string* token);
 
   static void ParseClientLoginFailure(const std::string& data,
                                       std::string* error,
                                       std::string* error_url,
                                       std::string* captcha_url,
                                       std::string* captcha_token);
 
   // Parse ClientLogin to OAuth2 response.
   static bool ParseClientLoginToOAuth2Response(
       const net::ResponseCookies& cookies,
       std::string* auth_code);
 
   static bool ParseClientLoginToOAuth2Cookie(const std::string& cookie,
                                              std::string* auth_code);
 
-  static GoogleServiceAuthError GenerateClientOAuthError(
-      const std::string& data,
-      const net::URLRequestStatus& status);
-
   // Is this a special case Gaia error for TwoFactor auth?
   static bool IsSecondFactorSuccess(const std::string& alleged_error);
 
   // Given parameters, create a ClientLogin request body.
   static std::string MakeClientLoginBody(
       const std::string& username,
       const std::string& password,
       const std::string& source,
       const char* const service,
       const std::string& login_token,
@@ skipping 14 matching lines @@
   // user information.
   static std::string MakeGetUserInfoBody(const std::string& lsid);
 
   // Supply the authentication token returned from StartIssueAuthToken.
   static std::string MakeMergeSessionBody(const std::string& auth_token,
                                        const std::string& continue_url,
                                        const std::string& source);
 
   static std::string MakeGetAuthCodeHeader(const std::string& auth_token);
 
-  static std::string MakeClientOAuthBody(const std::string& username,
-                                         const std::string& password,
-                                         const std::vector<std::string>& scopes,
-                                         const std::string& persistent_id,
-                                         const std::string& friendly_name,
-                                         const std::string& locale);
-
-  static std::string MakeClientOAuthChallengeResponseBody(
-      const std::string& name,
-      const std::string& token,
-      const std::string& solution);
-
   static std::string MakeOAuthLoginBody(const std::string& service,
                                         const std::string& source);
 
   // Create a fetcher usable for making any Gaia request.  |body| is used
   // as the body of the POST request sent to GAIA.  Any strings listed in
   // |headers| are added as extra HTTP headers in the request.
   //
   // |load_flags| are passed to directly to net::URLFetcher::Create() when
   // creating the URL fetcher.
   static net::URLFetcher* CreateGaiaFetcher(
@@ skipping 15 matching lines @@
   GaiaAuthConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
   std::string source_;
   const GURL client_login_gurl_;
   const GURL issue_auth_token_gurl_;
   const GURL oauth2_token_gurl_;
   const GURL oauth2_revoke_gurl_;
   const GURL get_user_info_gurl_;
   const GURL merge_session_gurl_;
   const GURL uberauth_token_gurl_;
-  const GURL client_oauth_gurl_;
   const GURL oauth_login_gurl_;
 
   // While a fetch is going on:
   scoped_ptr<net::URLFetcher> fetcher_;
   GURL client_login_to_oauth2_gurl_;
   std::string request_body_;
   std::string requested_service_; // Currently tracked for IssueAuthToken only.
   bool fetch_pending_;
 
   friend class GaiaAuthFetcherTest;
@@ skipping 11 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ParseOAuth2TokenPairResponse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthWithQuote);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeSuccess);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ClientOAuthChallengeQuote);
 
   DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher);
 };
 
 #endif  // GOOGLE_APIS_GAIA_GAIA_AUTH_FETCHER_H_