ListAccounts will return the Gaia ID as well as the email of the account.

components/signin/core/browser/gaia_cookie_manager_service.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/gaia_cookie_manager_service.h"
 
 #include <queue>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
-#include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace {
 
@@ skipping 301 matching lines @@
     const std::string& account_id,
     const std::string& access_token) {
   VLOG(1) << "GaiaCookieManagerService::AddAccountToCookieWithToken: "
           << account_id;
   DCHECK(!access_token.empty());
   access_token_ = access_token;
   AddAccountToCookieInternal(account_id);
 }
 
 bool GaiaCookieManagerService::ListAccounts(
-    std::vector<std::pair<std::string,bool> >* accounts) {
+    std::vector<gaia::ListedAccount>* accounts) {
   DCHECK(accounts);
   accounts->clear();
 
   // There is a fetch currently executing (the results being provided in the
   // parameter don't align with the fetches that have been started), or the list
   // of accounts haven't been fetched even once.
   if (!requests_.empty())
     return false;
 
   if (!list_accounts_fetched_once_) {
@@ skipping 201 matching lines @@
          GaiaCookieRequestType::LIST_ACCOUNTS);
   fetcher_backoff_.InformOfRequest(true);
 
   if (!gaia::ParseListAccountsData(data, &listed_accounts_)) {
     listed_accounts_.clear();
     OnListAccountsFailure(GoogleServiceAuthError(
         GoogleServiceAuthError::UNEXPECTED_SERVICE_RESPONSE));
     return;
   }
 
+  for (gaia::ListedAccount account : listed_accounts_) {
+    account.id = AccountTrackerService::PickAccountIdForAccount(
+        signin_client_->GetPrefs(), account.gaia_id, account.email);
+  }
+
   list_accounts_fetched_once_ = true;
   HandleNextRequest();
   // HandleNextRequest before sending out the notification because some
   // services, in response to OnGaiaAccountsInCookieUpdated, may try in return
   // to call ListAccounts, which would immediately return false if the
   // ListAccounts request is still sitting in queue.
   FOR_EACH_OBSERVER(Observer, observer_list_,
       OnGaiaAccountsInCookieUpdated(
           listed_accounts_,
           GoogleServiceAuthError(GoogleServiceAuthError::NONE)));
@@ skipping 126 matching lines @@
         break;
       case GaiaCookieRequestType::LIST_ACCOUNTS:
         uber_token_fetcher_.reset();
         signin_client_->DelayNetworkCall(
             base::Bind(&GaiaCookieManagerService::StartFetchingListAccounts,
                        base::Unretained(this)));
         break;
     };
   }
 }