Pre- and Auto-login should not log the user out of an already signed in

chrome/common/net/gaia/gaia_auth_fetcher.h

 // Copyright (c) 2011 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 CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_
 #define CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 53 matching lines @@
   // Start a request to get a particular key from user info.
   // GaiaAuthConsumer will be called back on the same thread when
   // results come back.
   // You can't make more than one request at a time.
   void StartGetUserInfo(const std::string& lsid,
                         const std::string& info_key);
 
   // Start a TokenAuth request to pre-login the user with the given credentials.
   void StartTokenAuth(const std::string& auth_token);
 
+  // Start a MergeSession request to pre-login the user with the given
+  // credentials.  Unlike TokenAuth above, MergeSession will not sign out any
+  // existing accounts.
+  void StartMergeSession(const std::string& auth_token);
+
   // Implementation of URLFetcher::Delegate
   virtual void OnURLFetchComplete(const URLFetcher* source,
                                   const GURL& url,
                                   const net::URLRequestStatus& status,
                                   int response_code,
                                   const net::ResponseCookies& cookies,
                                   const std::string& data);
 
   // StartClientLogin been called && results not back yet?
   bool HasPendingFetch();
@@ skipping 17 matching lines @@
   // The format of the POST body for ClientLogin.
   static const char kClientLoginFormat[];
   // The format of said POST body when CAPTCHA token & answer are specified.
   static const char kClientLoginCaptchaFormat[];
   // The format of the POST body for IssueAuthToken.
   static const char kIssueAuthTokenFormat[];
   // The format of the POST body for GetUserInfo.
   static const char kGetUserInfoFormat[];
   // The format of the POST body for TokenAuth.
   static const char kTokenAuthFormat[];
+  // The format of the POST body for MergeSession.
+  static const char kMergeSessionFormat[];
 
   // Constants for parsing ClientLogin errors.
   static const char kAccountDeletedError[];
   static const char kAccountDeletedErrorCode[];
   static const char kAccountDisabledError[];
   static const char kAccountDisabledErrorCode[];
   static const char kBadAuthenticationError[];
   static const char kBadAuthenticationErrorCode[];
   static const char kCaptchaError[];
   static const char kCaptchaErrorCode[];
@@ skipping 14 matching lines @@
                                int response_code);
 
   void OnGetUserInfoFetched(const std::string& data,
                             const net::URLRequestStatus& status,
                             int response_code);
 
   void OnTokenAuthFetched(const std::string& data,
                           const net::URLRequestStatus& status,
                           int response_code);
 
+  void OnMergeSessionFetched(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,
@@ skipping 18 matching lines @@
                                             const char* const service);
   // Supply the lsid returned from ClientLogin in order to fetch
   // user information.
   static std::string MakeGetUserInfoBody(const std::string& lsid);
 
   // Supply the authentication token returned from StartIssueAuthToken.
   static std::string MakeTokenAuthBody(const std::string& auth_token,
                                        const std::string& continue_url,
                                        const std::string& source);
 
-  // Create a fetcher useable for making any Gaia request.
+  // 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);
+
+  // Create a fetcher useable for making any Gaia request.  The flags
+  // net::LOAD_DO_NOT_SEND_COOKIES are used when creating the fetcher.

[Rick Campbell, 2011/08/09 21:02:52]

Please update the comment, probably either by appending "unless send_cookies is
true" or by just striking the last sentence.

[Roger Tawa OOO till Jul 10th, 2011/08/10 17:26:47]

Done.

   static URLFetcher* CreateGaiaFetcher(net::URLRequestContextGetter* getter,
                                        const std::string& body,
-                                       const GURL& gaia_gurl_,
+                                       const GURL& gaia_gurl,
+                                       bool send_cookies,
                                        URLFetcher::Delegate* delegate);
 
   // From a URLFetcher result, generate an appropriate error.
   // From the API documentation, both IssueAuthToken and ClientLogin have
   // the same error returns.
   static GoogleServiceAuthError GenerateAuthError(
       const std::string& data,
       const net::URLRequestStatus& status);
 
   // These fields are common to GaiaAuthFetcher, same every request
   GaiaAuthConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
   std::string source_;
   const GURL client_login_gurl_;
   const GURL issue_auth_token_gurl_;
   const GURL get_user_info_gurl_;
   const GURL token_auth_gurl_;
+  const GURL merge_session_gurl_;
 
   // While a fetch is going on:
   scoped_ptr<URLFetcher> fetcher_;
   std::string request_body_;
   std::string requested_service_;   // Currently tracked for IssueAuthToken only
   std::string requested_info_key_;  // Currently tracked for GetUserInfo only
   bool fetch_pending_;
 
   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);
 
   DISALLOW_COPY_AND_ASSIGN(GaiaAuthFetcher);
 };
 
 #endif  // CHROME_COMMON_NET_GAIA_GAIA_AUTH_FETCHER_H_