Move IdentityGetAccountsFunction to C++ IdentityManager

Remove the usage of the IdentityManager Mojo API in favor of the C++ API
for consistency with other //chrome/browser code.

Bug: 928184
Change-Id: I263a5fd9e5e2991639430b9d1280f88486c20690
Reviewed-on: https://chromium-review.googlesource.com/c/1456058
Auto-Submit: Henrique Ferreiro <hferreiro@igalia.com>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629563}

chrome/browser/extensions/api/identity/identity_get_accounts_function.cc

@@ -4,16 +4,18 @@
 
 #include "chrome/browser/extensions/api/identity/identity_get_accounts_function.h"
 
-#include "base/bind.h"
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "chrome/browser/extensions/api/identity/identity_api.h"
 #include "chrome/browser/extensions/api/identity/identity_constants.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/common/extensions/api/identity.h"
+#include "components/signin/core/browser/account_info.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/common/service_manager_connection.h"
-#include "services/identity/public/mojom/account.mojom.h"
-#include "services/identity/public/mojom/constants.mojom.h"
-#include "services/service_manager/public/cpp/connector.h"
+#include "services/identity/public/cpp/identity_manager.h"
 
 namespace extensions {
 
@@ -28,23 +30,14 @@ ExtensionFunction::ResponseAction IdentityGetAccountsFunction::Run() {
     return RespondNow(Error(identity_constants::kOffTheRecord));
   }
 
-  content::BrowserContext::GetConnectorFor(browser_context())
-      ->BindInterface(identity::mojom::kServiceName,
-                      mojo::MakeRequest(&identity_manager_));
-
-  identity_manager_->GetAccounts(
-      base::BindOnce(&IdentityGetAccountsFunction::OnGotAccounts, this));
-
-  return RespondLater();
-}
-
-void IdentityGetAccountsFunction::OnGotAccounts(
-    std::vector<identity::mojom::AccountPtr> accounts) {
+  std::vector<AccountInfo> accounts =
+      IdentityManagerFactory::GetForProfile(
+          Profile::FromBrowserContext(browser_context()))
+          ->GetAccountsWithRefreshTokens();
   std::unique_ptr<base::ListValue> infos(new base::ListValue());
 
   if (accounts.empty()) {
-    Respond(OneArgument(std::move(infos)));
-    return;
+    return RespondNow(OneArgument(std::move(infos)));
   }
 
   Profile* profile = Profile::FromBrowserContext(browser_context());
@@ -52,26 +45,23 @@ void IdentityGetAccountsFunction::OnGotAccounts(
                                   ->Get(profile)
                                   ->AreExtensionsRestrictedToPrimaryAccount();
 
-  // If extensions are restricted to the primary account and there is no valid
-  // primary account, short-circuit out.
-  if (primary_account_only && (!accounts[0]->state.is_primary_account ||
-                               !accounts[0]->state.has_refresh_token)) {
-    Respond(OneArgument(std::move(infos)));
-    return;
+  auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
+  api::identity::AccountInfo account_info;
+  if (primary_account_only) {
+    // If extensions are restricted to the primary account, only return the
+    // account info when there is a valid primary account.
+    if (identity_manager->HasPrimaryAccountWithRefreshToken()) {
+      account_info.id = identity_manager->GetPrimaryAccountInfo().gaia;
+      infos->Append(account_info.ToValue());
     }
-
+  } else {
     for (const auto& account : accounts) {
-    api::identity::AccountInfo account_info;
-    account_info.id = account->info.gaia;
+      account_info.id = account.gaia;
       infos->Append(account_info.ToValue());
-
-    // Stop after the primary account if extensions are restricted to the
-    // primary account.
-    if (primary_account_only)
-      break;
+    }
   }
 
-  Respond(OneArgument(std::move(infos)));
+  return RespondNow(OneArgument(std::move(infos)));
 }
 
 }  // namespace extensions

chrome/browser/extensions/api/identity/identity_get_accounts_function.h

@@ -7,7 +7,6 @@
 
 #include "extensions/browser/extension_function.h"
 #include "extensions/browser/extension_function_histogram_value.h"
-#include "services/identity/public/mojom/identity_manager.mojom.h"
 
 namespace extensions {
 
@@ -21,13 +20,8 @@ class IdentityGetAccountsFunction : public UIThreadExtensionFunction {
  private:
   ~IdentityGetAccountsFunction() override;
 
-  // Invoked in response to IdentityManager::GetAccounts().
-  void OnGotAccounts(std::vector<identity::mojom::AccountPtr> accounts);
-
   // UIThreadExtensionFunction implementation.
   ExtensionFunction::ResponseAction Run() override;
-
-  identity::mojom::IdentityManagerPtr identity_manager_;
 };
 
 }  // namespace extensions