requestAutocomplete (desktop): don't get stuck in infinite loop

components/autofill/content/browser/wallet/wallet_service_url.cc

 // Copyright 2013 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 "components/autofill/content/browser/wallet/wallet_service_url.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
@@ skipping 123 matching lines @@
 GURL GetSaveToWalletUrl(size_t user_index) {
   return GetBaseEncryptedFrontendUrl(user_index)
       .Resolve("saveToWallet?s7e=card_number%3Bcvn");
 }
 
 GURL GetPassiveAuthUrl(size_t user_index) {
   return GetBaseWalletUrl(user_index)
       .Resolve("passiveauth?isChromePayments=true");
 }
 
-GURL GetSignInUrl() {
+GURL GetAddAccountUrl() {
   GURL url(GaiaUrls::GetInstance()->add_account_url());
   url = net::AppendQueryParameter(url, "nui", "1");
   // Prevents promos from showing (see http://crbug.com/235227).
   url = net::AppendQueryParameter(url, "sarp", "1");
   url = net::AppendQueryParameter(url,
                                   "continue",
                                   GetSignInContinueUrl().spec());
   return url;
 }
 
+GURL GetSignInUrl(size_t user_index) {
+  GURL url(GaiaUrls::GetInstance()->service_login_url());
+  url = net::AppendQueryParameter(
+      url, "authuser", base::SizeTToString(user_index));
+  // Prevents promos from showing (see http://crbug.com/235227).
+  url = net::AppendQueryParameter(url, "sarp", "1");
+  url =
+      net::AppendQueryParameter(url, "continue", GetSignInContinueUrl().spec());
+  return url;
+}
+
 // The continue url portion of the sign-in URL. This URL is used as a milestone
 // to determine that the sign-in process is finished. It has to be a Google
 // domain, use https://, and do almost nothing, but otherwise it's not too
 // important what the URL actually is: it's not important that this URL has the
 // ability to generate a gdToken.
 GURL GetSignInContinueUrl() {
   return GetPassiveAuthUrl(0);
 }
 
 bool IsSignInContinueUrl(const GURL& url, size_t* user_index) {
@@ skipping 15 matching lines @@
       base::StringToSizeT(query_str.substr(value.begin, value.len), user_index);
       break;
     }
   }
 
   return true;
 }
 
 bool IsSignInRelatedUrl(const GURL& url) {
   size_t unused;
-  return url.GetOrigin() == GetSignInUrl().GetOrigin() ||
-      StartsWith(base::UTF8ToUTF16(url.GetOrigin().host()),
-                 base::ASCIIToUTF16("accounts."),
-                 false) ||
-      IsSignInContinueUrl(url, &unused);
+  return url.GetOrigin() == GetAddAccountUrl().GetOrigin() ||
+         StartsWith(base::UTF8ToUTF16(url.GetOrigin().host()),
+                    base::ASCIIToUTF16("accounts."),
+                    false) ||
+         IsSignInContinueUrl(url, &unused);
 }
 
 bool IsUsingProd() {
   return GetWalletHostUrl() == GURL(kProdWalletServiceUrl);
 }
 
 }  // namespace wallet
 }  // namespace autofill