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

google_apis/gaia/merge_session_helper.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 "google_apis/gaia/merge_session_helper.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/stl_util.h"
@@ skipping 25 matching lines @@
        ++it) {
     results.push_back(it->first + ":" + it->second);
   }
   return JoinString(results, ",");
 }
 
 void MergeSessionHelper::ExternalCcResultFetcher::Start() {
   CleanupTransientState();
   results_.clear();
   gaia_auth_fetcher_.reset(
-      new GaiaAuthFetcher(this, GaiaConstants::kChromeSource,
+      new GaiaAuthFetcher(this, helper_->source_,
                           helper_->request_context()));
   gaia_auth_fetcher_->StartGetCheckConnectionInfo();
 }
 
 bool MergeSessionHelper::ExternalCcResultFetcher::IsRunning() {
   return gaia_auth_fetcher_ || fetchers_.size() > 0u;
 }
 
 void MergeSessionHelper::ExternalCcResultFetcher::TimeoutForTests() {
   Timeout();
@@ skipping 88 matching lines @@
 
   for (URLToTokenAndFetcher::const_iterator it = fetchers_.begin();
        it != fetchers_.end(); ++it) {
     delete it->second.second;
   }
   fetchers_.clear();
 }
 
 MergeSessionHelper::MergeSessionHelper(
     OAuth2TokenService* token_service,
+    const std::string& source,
     net::URLRequestContextGetter* request_context,
     Observer* observer)
     : token_service_(token_service),
       request_context_(request_context),
-      result_fetcher_(this) {
+      result_fetcher_(this),
+      source_(source) {
   if (observer)
     AddObserver(observer);
 }
 
 MergeSessionHelper::~MergeSessionHelper() {
   DCHECK(accounts_.empty());
 }
 
 void MergeSessionHelper::LogIn(const std::string& account_id) {
   DCHECK(!account_id.empty());
@@ skipping 85 matching lines @@
   result_fetcher_.Start();
 }
 
 bool MergeSessionHelper::StillFetchingExternalCcResult() {
   return result_fetcher_.IsRunning();
 }
 
 void MergeSessionHelper::StartLogOutUrlFetch() {
   DCHECK(accounts_.front().empty());
   VLOG(1) << "MergeSessionHelper::StartLogOutUrlFetch";
-  GURL logout_url(GaiaUrls::GetInstance()->service_logout_url());
+  GURL logout_url(GaiaUrls::GetInstance()->service_logout_url().Resolve(
+          base::StringPrintf("?source=%s", source_.c_str())));
   net::URLFetcher* fetcher =
       net::URLFetcher::Create(logout_url, net::URLFetcher::GET, this);
   fetcher->SetRequestContext(request_context_);
   fetcher->Start();
 }
 
 void MergeSessionHelper::OnUbertokenSuccess(const std::string& uber_token) {
   VLOG(1) << "MergeSessionHelper::OnUbertokenSuccess"
           << " account=" << accounts_.front();
   gaia_auth_fetcher_.reset(new GaiaAuthFetcher(this,
-                                               GaiaConstants::kChromeSource,
+                                               source_,
                                                request_context_));
 
   // It's possible that not all external checks have completed.
   // GetExternalCcResult() returns results for those that have.
   gaia_auth_fetcher_->StartMergeSession(uber_token,
                                         result_fetcher_.GetExternalCcResult());
 }
 
 void MergeSessionHelper::OnUbertokenFailure(
     const GoogleServiceAuthError& error) {
@@ skipping 20 matching lines @@
   const std::string account_id = accounts_.front();
   HandleNextAccount();
   SignalComplete(account_id, error);
 }
 
 void MergeSessionHelper::StartFetching() {
   VLOG(1) << "MergeSessionHelper::StartFetching account_id="
           << accounts_.front();
   uber_token_fetcher_.reset(new UbertokenFetcher(token_service_,
                                                  this,
+                                                 source_,
                                                  request_context_));
   uber_token_fetcher_->StartFetchingToken(accounts_.front());
 }
 
 void MergeSessionHelper::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK(accounts_.front().empty());
   VLOG(1) << "MergeSessionHelper::OnURLFetchComplete";
   HandleNextAccount();
 }
 
 void MergeSessionHelper::HandleNextAccount() {
   VLOG(1) << "MergeSessionHelper::HandleNextAccount";
   accounts_.pop_front();
   gaia_auth_fetcher_.reset();
   if (accounts_.empty()) {
     VLOG(1) << "MergeSessionHelper::HandleNextAccount: no more";
     uber_token_fetcher_.reset();
   } else {
     if (accounts_.front().empty()) {
       StartLogOutUrlFetch();
     } else {
       StartFetching();
     }
   }
 }