Allow gaia auth fetcher to work with arbitrary clients.

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 80 matching lines @@
   // called on the consumer on the original thread.
   void StartCookieForOAuthLoginTokenExchange(const std::string& session_index);
 
   // Start a request to exchange the cookies of a signed-in user session
   // for an OAuthLogin-scoped oauth2 token. In the case of a session with
   // multiple accounts signed in, |session_index| indicate the which of accounts
   // within the session.
   // Resulting refresh token is annotated on the server with |device_id|. Format
   // of device_id on the server is at most 64 unicode characters.
   //
-  // Either OnClientOAuthSuccess or OnClientOAuthFailure will be
-  // called on the consumer on the original thread.
+  // Either both OnClientOAuthCode and OnClientOAuthSuccess or
+  // OnClientOAuthFailure with optional OnClientOAuthCode will be called on the
+  // consumer on the original thread.
   void StartCookieForOAuthLoginTokenExchangeWithDeviceId(
       const std::string& session_index,
       const std::string& device_id);
 
+  // Start a request to exchange the cookies of a signed-in user session
+  // and for specified client for an OAuthLogin-scoped oauth2 token. Client is
+  // determined by its |client_id|. In the case of a session with multiple
+  // accounts signed in, |session_index| indicate the which of accounts
+  // within the session. If |fetch_token_from_auth_code| is not set fetching
+  // process stops after receiving an auth code and ClientOAuthSuccess won't be
+  // called.
+  // Resulting refresh token is annotated on the server with |device_id|. Format
+  // of device_id on the server is at most 64 unicode characters.
+  //
+  // Either OnClientOAuthCode with optional ClientOAuthSuccess or
+  // OnClientOAuthFailure with optional OnClientOAuthCode will be called on the
+  // consumer on the original thread.
+  void StartCookieForOAuthLoginTokenExchangeWithClientIdAndDeviceId(
+      bool fetch_token_from_auth_code,
+      const std::string& session_index,
+      const std::string& client_id,
+      const std::string& device_id);
+
   // Start a request to exchange the authorization code for an OAuthLogin-scoped
   // oauth2 token.
   //
   // Either OnClientOAuthSuccess or OnClientOAuthFailure will be
   // called on the consumer on the original thread.
   void StartAuthCodeForOAuth2TokenExchange(const std::string& auth_code);
 
   // Start a request to exchange the authorization code for an OAuthLogin-scoped
   // oauth2 token.
   // Resulting refresh token is annotated on the server with |device_id|. Format
@@ skipping 309 matching lines @@
   const GURL logout_gurl_;
   const GURL get_check_connection_info_url_;
   const GURL oauth2_iframe_url_;
 
   // 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_;
   bool fetch_pending_;
+  bool fetch_token_from_auth_code_;
 
   // Headers used during the Logout call.
   std::string logout_headers_;
 
   friend class GaiaAuthFetcherTest;
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CaptchaParse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, AccountDeletedError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, AccountDisabledError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, BadAuthenticationError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, IncomprehensibleError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, ServiceUnavailableError);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CheckNormalErrorCode);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, CheckTwoFactorResponse);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest, LoginNetFailure);
   FRIEND_TEST_ALL_PREFIXES(GaiaAuthFetcherTest,
       ParseClientLoginToOAuth2Response);
   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_