Use a distinct source parameter on gaia endpoints for the reconcilor.

google_apis/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 "google_apis/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 152 matching lines @@
 // static
 const char GaiaAuthFetcher::kClientLoginToOAuth2CookiePartHttpOnly[] =
     "httponly";
 // static
 const char GaiaAuthFetcher::kClientLoginToOAuth2CookiePartCodePrefix[] =
     "oauth_code=";
 // static
 const int GaiaAuthFetcher::kClientLoginToOAuth2CookiePartCodePrefixLength =
     arraysize(GaiaAuthFetcher::kClientLoginToOAuth2CookiePartCodePrefix) - 1;
 
+// static
+GURL GaiaAuthFetcher::BuildListAccountsURL(const std::string& source) {
+  if (source.empty()) {
+    return GaiaUrls::GetInstance()->list_accounts_url();
+  } else {
+    std::string query = GaiaUrls::GetInstance()->list_accounts_url().query();

[Mike Lerman, 2014/09/26 16:57:07]

It seems like the logic in this method and the method below should live in
gaia_urls. All other work to compile and resolve URLs is done there.

[guohui, 2014/09/26 17:36:01]

+1

[Roger Tawa OOO till Jul 10th, 2014/09/26 19:42:39]

Done.

[Roger Tawa OOO till Jul 10th, 2014/09/26 19:42:39]

Done.

+    return GaiaUrls::GetInstance()->list_accounts_url().Resolve(
+              base::StringPrintf("?source=%s&%s", source.c_str(),

[guohui, 2014/09/26 17:36:02]

do we know if source is not already used by gaia as a parameter for listing
account?

[Roger Tawa OOO till Jul 10th, 2014/09/26 19:42:39]

Yes I already checked with gaia folks.

+                                 query.c_str()));

[Mike Lerman, 2014/09/26 16:57:07]

If query.empty() then you're adding an un-needed &.

[Roger Tawa OOO till Jul 10th, 2014/09/26 19:42:39]

Unfortunately, GURL::Resolve("?foo=bar") removes any existing query parameters
in the URL instead of appending the specified one.  Do you know if there is a
function that does this already?

[Mike Lerman, 2014/09/26 20:18:10]

I can't find one. Is it worth having a condition, where if query.empty() you
only append ?source=%s, else you append ?source=%s&%s with the extra parameter?
I suppose not, since there is always a query parameter on list_accounts_url()
and that's defined in this very class.

[Roger Tawa OOO till Jul 10th, 2014/09/27 00:30:27]

Yup, that's why I did not do so.

+  }
+}
+
+// static
+GURL GaiaAuthFetcher::BuildGetCheckConnectionInfoURL(
+    const std::string& source) {
+  return source.empty()
+      ? GaiaUrls::GetInstance()->get_check_connection_info_url()
+      : GaiaUrls::GetInstance()->get_check_connection_info_url().Resolve(
+            base::StringPrintf("?source=%s", source.c_str()));
+}
+
 GaiaAuthFetcher::GaiaAuthFetcher(GaiaAuthConsumer* consumer,
                                  const std::string& source,
                                  net::URLRequestContextGetter* getter)
     : consumer_(consumer),
       getter_(getter),
       source_(source),
       client_login_gurl_(GaiaUrls::GetInstance()->client_login_url()),
       issue_auth_token_gurl_(GaiaUrls::GetInstance()->issue_auth_token_url()),
       oauth2_token_gurl_(GaiaUrls::GetInstance()->oauth2_token_url()),
       oauth2_revoke_gurl_(GaiaUrls::GetInstance()->oauth2_revoke_url()),
       get_user_info_gurl_(GaiaUrls::GetInstance()->get_user_info_url()),
       merge_session_gurl_(GaiaUrls::GetInstance()->merge_session_url()),
       uberauth_token_gurl_(GaiaUrls::GetInstance()->oauth1_login_url().Resolve(
           base::StringPrintf(kUberAuthTokenURLFormat, source.c_str()))),
       oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()),
-      list_accounts_gurl_(GaiaUrls::GetInstance()->list_accounts_url()),
-      get_check_connection_info_url_(
-          GaiaUrls::GetInstance()->get_check_connection_info_url()),
+      list_accounts_gurl_(BuildListAccountsURL(source)),
+      get_check_connection_info_url_(BuildGetCheckConnectionInfoURL(source)),
       client_login_to_oauth2_gurl_(
           GaiaUrls::GetInstance()->client_login_to_oauth2_url()),
       fetch_pending_(false) {}
 
 GaiaAuthFetcher::~GaiaAuthFetcher() {}
 
 bool GaiaAuthFetcher::HasPendingFetch() {
   return fetch_pending_;
 }
 
@@ skipping 773 matching lines @@
     NOTREACHED();
   }
 }
 
 // static
 bool GaiaAuthFetcher::IsSecondFactorSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }