Added multi-login support to one-click signin.

chrome/common/net/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 "chrome/common/net/gaia/gaia_auth_fetcher.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 489 matching lines @@
                                    kLoadFlagsIgnoreCookies,
                                    this));
   fetch_pending_ = true;
   fetcher_->Start();
 }
 
 void GaiaAuthFetcher::StartOAuthLoginTokenFetch(
     const std::string& auth_token) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
-  DVLOG(1) << "Starting OAuth login token fetch";
+  DVLOG(1) << "Starting OAuth login token fetch with auth_token";
   request_body_ = MakeGetAuthCodeBody();
-
-  // If no auth_token is given, then make sure to use the cookie jar with this
-  // request.  Otherwise the token contains all the necessary information and
-  // the cookie jar should not be touched.
-  int load_flags = net::LOAD_NORMAL;
-  std::string auth_code_header = "";
-
-  if (!auth_token.empty()) {
-    load_flags = kLoadFlagsIgnoreCookies;
-    auth_code_header = MakeGetAuthCodeHeader(auth_token);
-  }
+  client_login_to_oauth2_gurl_ =
+      GURL(GaiaUrls::GetInstance()->client_login_to_oauth2_url());
 
   fetcher_.reset(CreateGaiaFetcher(getter_,
                                    request_body_,
-                                   auth_code_header,
+                                   MakeGetAuthCodeHeader(auth_token),
                                    client_login_to_oauth2_gurl_,
-                                   load_flags,
+                                   kLoadFlagsIgnoreCookies,
                                    this));
   fetch_pending_ = true;
   fetcher_->Start();
+}
+
+void GaiaAuthFetcher::StartOAuthLoginTokenFetchWithCookies(
+    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();
+
+  std::string url = GaiaUrls::GetInstance()->client_login_to_oauth2_url();
+  if (!session_index.empty()) {
+    url += "?authuser=";
+    url += session_index;

[Andrew T Wilson (Slow), 2012/03/06 20:42:46]

Can you do url += "?authuser=" + session_index; or will that not work?

[Roger Tawa OOO till Jul 10th, 2012/03/06 21:25:17]

Done.

+  }
+  client_login_to_oauth2_gurl_ = GURL(url);
+
+  fetcher_.reset(CreateGaiaFetcher(getter_,
+                                   request_body_,
+                                   "",
+                                   client_login_to_oauth2_gurl_,
+                                   net::LOAD_NORMAL,
+                                   this));
+  fetch_pending_ = true;
+  fetcher_->Start();
 }
 
 void GaiaAuthFetcher::StartGetUserInfo(const std::string& lsid) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   DVLOG(1) << "Starting GetUserInfo for lsid=" << lsid;
   request_body_ = MakeGetUserInfoBody(lsid);
   fetcher_.reset(CreateGaiaFetcher(getter_,
                                    request_body_,
                                    "",
@@ skipping 330 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }