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

chrome/browser/signin/account_reconcilor_unittest.cc

Index: chrome/browser/signin/account_reconcilor_unittest.cc
diff --git a/chrome/browser/signin/account_reconcilor_unittest.cc b/chrome/browser/signin/account_reconcilor_unittest.cc
index fe138495977587bdc20e8e5090500867f90cc568..4948d6b1ec36983582562f47b1f888eb2ba8b86b 100644
--- a/chrome/browser/signin/account_reconcilor_unittest.cc
+++ b/chrome/browser/signin/account_reconcilor_unittest.cc
@@ -330,10 +330,10 @@ TEST_F(AccountReconcilorTest, GetAccountsFromCookieSuccess) {
   base::RunLoop().RunUntilIdle();
   ASSERT_EQ(AccountReconcilor::State::APPLYING_CHANGES, reconcilor->GetState());
 
-  std::vector<std::pair<std::string, bool> > accounts;
+  std::vector<gaia::ListedAccount> accounts;
   ASSERT_TRUE(cookie_manager_service()->ListAccounts(&accounts));
   ASSERT_EQ(1u, accounts.size());
-  ASSERT_EQ(account_id, accounts[0].first);
+  ASSERT_EQ(account_id, accounts[0].email);

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

Shouldn't this be: accounts[0].account_id ?

 }
 
 TEST_F(AccountReconcilorTest, GetAccountsFromCookieFailure) {
@@ -350,7 +350,7 @@ TEST_F(AccountReconcilorTest, GetAccountsFromCookieFailure) {
             reconcilor->GetState());
   base::RunLoop().RunUntilIdle();
 
-  std::vector<std::pair<std::string, bool> > accounts;
+  std::vector<gaia::ListedAccount> accounts;
   ASSERT_FALSE(cookie_manager_service()->ListAccounts(&accounts));
   ASSERT_EQ(0u, accounts.size());
 
@@ -397,7 +397,7 @@ TEST_P(AccountReconcilorTest, StartReconcileCookiesDisabled) {
   ASSERT_FALSE(reconcilor->is_reconcile_started_);
 
   base::RunLoop().RunUntilIdle();
-  std::vector<std::pair<std::string, bool> > accounts;
+  std::vector<gaia::ListedAccount> accounts;
   // This will be the first call to ListAccounts.
   ASSERT_FALSE(cookie_manager_service()->ListAccounts(&accounts));
   ASSERT_FALSE(reconcilor->is_reconcile_started_);