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

google_apis/gaia/gaia_auth_util.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_util.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 25 matching lines @@
       base::RemoveChars(parts[0], ".", &parts[0]);
   }
 
   std::string new_email = base::StringToLowerASCII(JoinString(parts, at));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
 }
 
 }  // namespace
 
+
+ListedAccount::ListedAccount() {}
+
+ListedAccount::~ListedAccount() {}
+
+bool ListedAccount::operator==(const ListedAccount& other) const {
+  return email == other.email &&
+         gaia_id == other.gaia_id &&
+         valid == other.valid &&
+         raw_email == other.raw_email;

[Roger Tawa OOO till Jul 10th, 2015/06/02 21:58:42]

Do we need to check all fields?  Should be enough to check only account_id.

+}
+
 std::string CanonicalizeEmail(const std::string& email_address) {
   // CanonicalizeEmail() is called to process email strings that are eventually
   // shown to the user, and may also be used in persisting email strings.  To
   // avoid breaking this existing behavior, this function will not try to
   // change googlemail to gmail.
   return CanonicalizeEmailImpl(email_address, false);
 }
 
 std::string CanonicalizeDomain(const std::string& domain) {
   // Canonicalization of domain names means lower-casing them. Make sure to
@@ skipping 31 matching lines @@
 
 bool IsGaiaSignonRealm(const GURL& url) {
   if (!url.SchemeIsCryptographic())
     return false;
 
   return url == GaiaUrls::GetInstance()->gaia_url();
 }
 
 
 bool ParseListAccountsData(
-    const std::string& data,
-    std::vector<std::pair<std::string, bool> >* accounts) {
+    const std::string& data, std::vector<ListedAccount>* accounts) {
   accounts->clear();
 
   // Parse returned data and make sure we have data.
   scoped_ptr<base::Value> value = base::JSONReader::Read(data);
   if (!value)
     return false;
 
   base::ListValue* list;
   if (!value->GetAsList(&list) || list->GetSize() < 2)
     return false;
@@ skipping 12 matching lines @@
       // Canonicalize the email since ListAccounts returns "display email".
       if (account->GetString(3, &email) && !email.empty()) {
         // New version if ListAccounts indicates whether the email's session
         // is still valid or not.  If this value is present and false, assume
         // its invalid.  Otherwise assume it's valid to remain compatible with
         // old version.
         int is_email_valid = 1;
         if (!account->GetInteger(9, &is_email_valid))
           is_email_valid = 1;
 
-        accounts->push_back(
-            std::make_pair(CanonicalizeEmail(email), is_email_valid != 0));
+        std::string gaia_id;
+        // ListAccounts must also return the Gaia Id.
+        if (account->GetString(10, &gaia_id) && !gaia_id.empty()) {
+          ListedAccount listed_account;
+          listed_account.email = CanonicalizeEmail(email);
+          listed_account.gaia_id = gaia_id;
+          listed_account.valid = is_email_valid != 0;
+          listed_account.raw_email = email;
+          accounts->push_back(listed_account);
+        }
       }
     }
   }
 
   return true;
 }
 
 }  // namespace gaia