commit 6bc26cfa47ea4d893086e9839ce07297a54fc422
author Henrique Ferreiro <hferreiro@igalia.com> Wed Jan 16 10:58:06 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jan 16 10:58:06 2019
tree 72dfd11558f90f5b32fe20f13184192ad09b7c34
parent afab2e5e80bd6db6d6723f08b6e3ab531948537e

Port signin_ui_util.cc away from ListAccounts()

The CL removes the dependency on GaiaCookieManagerService

Bug: 921501
Change-Id: I948d868c437d99399050192f6efd4667cf0e12ac
Reviewed-on: https://chromium-review.googlesource.com/c/1411922
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#623191}

chrome/browser/signin/signin_ui_util.cc

diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 2953478..375af7c 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
-#include "chrome/browser/signin/gaia_cookie_manager_service_factory.h"
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_global_error.h"
@@ -30,7 +29,6 @@
 #include "components/signin/core/browser/account_consistency_method.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/gaia_cookie_manager_service.h"
 #include "components/signin/core/browser/identity_utils.h"
 #include "components/signin/core/browser/signin_pref_names.h"
 #include "components/user_manager/user_manager.h"
@@ -224,15 +222,16 @@
     default_account_id = identity_manager->GetPrimaryAccountId();
   } else {
     // Fetch accounts in the Gaia cookies.
-    GaiaCookieManagerService* cookie_manager_service =
-        GaiaCookieManagerServiceFactory::GetForProfile(profile);
-    std::vector<gaia::ListedAccount> cookie_accounts;
-    bool cookie_accounts_valid =
-        cookie_manager_service->ListAccounts(&cookie_accounts, nullptr);
+    auto accounts_in_cookie_jar_info =
+        identity_manager->GetAccountsInCookieJar();
+    std::vector<AccountInfo> signed_in_accounts =
+        accounts_in_cookie_jar_info.signed_in_accounts;
     UMA_HISTOGRAM_BOOLEAN("Profile.DiceUI.GaiaAccountsStale",
-                          !cookie_accounts_valid);
-    if (cookie_accounts_valid && !cookie_accounts.empty())
-      default_account_id = cookie_accounts[0].id;
+                          !accounts_in_cookie_jar_info.accounts_are_fresh);
+
+    if (accounts_in_cookie_jar_info.accounts_are_fresh &&
+        !signed_in_accounts.empty())
+      default_account_id = signed_in_accounts[0].account_id;
   }
 
   // Fetch account information for each id and make sure that the first account