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

components/signin/core/browser/account_reconcilor.cc

 // Copyright 2014 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/signin/core/browser/account_reconcilor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ skipping 43 matching lines @@
 }  // namespace
 
 
 AccountReconcilor::AccountReconcilor(ProfileOAuth2TokenService* token_service,
                                      SigninManagerBase* signin_manager,
                                      SigninClient* client)
     : token_service_(token_service),
       signin_manager_(signin_manager),
       client_(client),
       merge_session_helper_(token_service_,
+                            GaiaConstants::kReconcilorSource,
                             client->GetURLRequestContext(),
                             this),
       registered_with_token_service_(false),
       is_reconcile_started_(false),
       first_execution_(true),
       are_gaia_accounts_set_(false) {
   VLOG(1) << "AccountReconcilor::AccountReconcilor";
 }
 
 AccountReconcilor::~AccountReconcilor() {
@@ skipping 162 matching lines @@
   // Reset state for validating oauth2 tokens.
   primary_account_.clear();
   chrome_accounts_.clear();
   add_to_cookie_.clear();
   ValidateAccountsFromTokenService();
 }
 
 void AccountReconcilor::GetAccountsFromCookie(
     GetAccountsFromCookieCallback callback) {
   get_gaia_accounts_callbacks_.push_back(callback);
-  if (!gaia_fetcher_) {
-    // There is no list account request in flight.
-    gaia_fetcher_.reset(new GaiaAuthFetcher(
-        this, GaiaConstants::kChromeSource, client_->GetURLRequestContext()));
-    gaia_fetcher_->StartListAccounts();
-  }
+  if (!gaia_fetcher_)
+    MayBeDoNextListAccounts();
 }
 
 void AccountReconcilor::StartFetchingExternalCcResult() {
   merge_session_helper_.StartFetchingExternalCcResult();
 }
 
 void AccountReconcilor::OnListAccountsSuccess(const std::string& data) {
   gaia_fetcher_.reset();
 
   // Get account information from response data.
@@ skipping 33 matching lines @@
 
   get_gaia_accounts_callbacks_.front().Run(error, empty_accounts);
   get_gaia_accounts_callbacks_.pop_front();
 
   MayBeDoNextListAccounts();
 }
 
 void AccountReconcilor::MayBeDoNextListAccounts() {
   if (!get_gaia_accounts_callbacks_.empty()) {
     gaia_fetcher_.reset(new GaiaAuthFetcher(
-        this, GaiaConstants::kChromeSource, client_->GetURLRequestContext()));
+        this, GaiaConstants::kReconcilorSource,
+        client_->GetURLRequestContext()));
     gaia_fetcher_->StartListAccounts();
   }
 }
 
 void AccountReconcilor::ContinueReconcileActionAfterGetGaiaAccounts(
     const GoogleServiceAuthError& error,
     const std::vector<std::pair<std::string, bool> >& accounts) {
   if (error.state() == GoogleServiceAuthError::NONE) {
     gaia_accounts_ = accounts;
     are_gaia_accounts_set_ = true;
@@ skipping 165 matching lines @@
     const std::string& account_id,
     const GoogleServiceAuthError& error) {
   VLOG(1) << "AccountReconcilor::MergeSessionCompleted: account_id="
           << account_id << " error=" << error.ToString();
 
   if (MarkAccountAsAddedToCookie(account_id)) {
     CalculateIfReconcileIsDone();
     ScheduleStartReconcileIfChromeAccountsChanged();
   }
 }