Remove IdentityManagerImpl dependency on SigninManager.

TBR=droger@chromium.org

Bug: 933109
Change-Id: I64b2587470112cddf86c6f9b8f126f8cdfc8cc25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1495546
Commit-Queue: Lowell Manners <lowell@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637633}

chrome/browser/profiles/profile_impl.cc

@@ -1256,7 +1256,6 @@ std::unique_ptr<service_manager::Service> ProfileImpl::HandleServiceRequest(
     return std::make_unique<identity::IdentityService>(
         IdentityManagerFactory::GetForProfile(this),
         AccountTrackerServiceFactory::GetForProfile(this),
-        SigninManagerFactory::GetForProfile(this),
         ProfileOAuth2TokenServiceFactory::GetForProfile(this),
         std::move(request));
   }

ios/chrome/browser/signin/identity_service_creator.cc

@@ -20,11 +20,8 @@ std::unique_ptr<service_manager::Service> CreateIdentityService(
       IdentityManagerFactory::GetForBrowserState(browser_state);
   AccountTrackerService* account_tracker =
       ios::AccountTrackerServiceFactory::GetForBrowserState(browser_state);
-  SigninManagerBase* signin_manager =
-      ios::SigninManagerFactory::GetForBrowserState(browser_state);
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForBrowserState(browser_state);
   return std::make_unique<identity::IdentityService>(
-      identity_manager, account_tracker, signin_manager, token_service,
-      std::move(request));
+      identity_manager, account_tracker, token_service, std::move(request));
 }

services/identity/identity_accessor_impl.cc

@@ -60,22 +60,19 @@ void IdentityAccessorImpl::AccessTokenRequest::OnRequestCompleted(
 void IdentityAccessorImpl::Create(mojom::IdentityAccessorRequest request,
                                   IdentityManager* identity_manager,
                                   AccountTrackerService* account_tracker,
-                                  SigninManagerBase* signin_manager,
                                   ProfileOAuth2TokenService* token_service) {
   new IdentityAccessorImpl(std::move(request), identity_manager,
-                           account_tracker, signin_manager, token_service);
+                           account_tracker, token_service);
 }
 
 IdentityAccessorImpl::IdentityAccessorImpl(
     mojom::IdentityAccessorRequest request,
     IdentityManager* identity_manager,
     AccountTrackerService* account_tracker,
-    SigninManagerBase* signin_manager,
     ProfileOAuth2TokenService* token_service)
     : binding_(this, std::move(request)),
       identity_manager_(identity_manager),
       account_tracker_(account_tracker),
-      signin_manager_(signin_manager),
       token_service_(token_service) {
   binding_.set_connection_error_handler(base::BindRepeating(
       &IdentityAccessorImpl::OnConnectionError, base::Unretained(this)));
@@ -90,19 +87,14 @@ IdentityAccessorImpl::~IdentityAccessorImpl() {
 
 void IdentityAccessorImpl::GetPrimaryAccountInfo(
     GetPrimaryAccountInfoCallback callback) {
-  // It's annoying that this can't be trivially implemented in terms of
-  // GetAccountInfoFromGaiaId(), but there's no SigninManagerBase method that
-  // directly returns the authenticated GAIA ID. We can of course get it from
-  // the AccountInfo but once we have the AccountInfo we ... have the
-  // AccountInfo.
-  AccountInfo account_info = signin_manager_->GetAuthenticatedAccountInfo();
+  AccountInfo account_info = identity_manager_->GetPrimaryAccountInfo();
   AccountState account_state = GetStateOfAccount(account_info);
   std::move(callback).Run(account_info, account_state);
 }
 
 void IdentityAccessorImpl::GetPrimaryAccountWhenAvailable(
     GetPrimaryAccountWhenAvailableCallback callback) {
-  AccountInfo account_info = signin_manager_->GetAuthenticatedAccountInfo();
+  AccountInfo account_info = identity_manager_->GetPrimaryAccountInfo();
   AccountState account_state = GetStateOfAccount(account_info);
 
   if (!account_state.has_refresh_token ||
@@ -178,7 +170,7 @@ AccountState IdentityAccessorImpl::GetStateOfAccount(
   account_state.has_refresh_token =
       token_service_->RefreshTokenIsAvailable(account_info.account_id);
   account_state.is_primary_account =
-      (account_info.account_id == signin_manager_->GetAuthenticatedAccountId());
+      (account_info.account_id == identity_manager_->GetPrimaryAccountId());
   return account_state;
 }
 

services/identity/identity_accessor_impl.h

@@ -10,7 +10,6 @@
 #include "base/callback_list.h"
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_manager_base.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/identity/public/cpp/account_state.h"
 #include "services/identity/public/cpp/identity_manager.h"
@@ -27,13 +26,11 @@ class IdentityAccessorImpl : public mojom::IdentityAccessor,
   static void Create(mojom::IdentityAccessorRequest request,
                      IdentityManager* identity_manager,
                      AccountTrackerService* account_tracker,
-                     SigninManagerBase* signin_manager,
                      ProfileOAuth2TokenService* token_service);
 
   IdentityAccessorImpl(mojom::IdentityAccessorRequest request,
                        IdentityManager* identity_manager,
                        AccountTrackerService* account_tracker,
-                       SigninManagerBase* signin_manager,
                        ProfileOAuth2TokenService* token_service);
   ~IdentityAccessorImpl() override;
 
@@ -106,7 +103,6 @@ class IdentityAccessorImpl : public mojom::IdentityAccessor,
   mojo::Binding<mojom::IdentityAccessor> binding_;
   IdentityManager* identity_manager_;
   AccountTrackerService* account_tracker_;
-  SigninManagerBase* signin_manager_;
   ProfileOAuth2TokenService* token_service_;
 
   // The set of pending requests for access tokens.

services/identity/identity_service.cc

@@ -14,13 +14,11 @@ namespace identity {
 
 IdentityService::IdentityService(IdentityManager* identity_manager,
                                  AccountTrackerService* account_tracker,
-                                 SigninManagerBase* signin_manager,
                                  ProfileOAuth2TokenService* token_service,
                                  service_manager::mojom::ServiceRequest request)
     : service_binding_(this, std::move(request)),
       identity_manager_(identity_manager),
       account_tracker_(account_tracker),
-      signin_manager_(signin_manager),
       token_service_(token_service) {
   registry_.AddInterface<mojom::IdentityAccessor>(
       base::Bind(&IdentityService::Create, base::Unretained(this)));
@@ -41,13 +39,13 @@ void IdentityService::ShutDown() {
   if (IsShutDown())
     return;
 
-  signin_manager_ = nullptr;
+  identity_manager_ = nullptr;
   token_service_ = nullptr;
   account_tracker_ = nullptr;
 }
 
 bool IdentityService::IsShutDown() {
-  return (signin_manager_ == nullptr);
+  return (identity_manager_ == nullptr);
 }
 
 void IdentityService::Create(mojom::IdentityAccessorRequest request) {
@@ -56,8 +54,7 @@ void IdentityService::Create(mojom::IdentityAccessorRequest request) {
     return;
 
   IdentityAccessorImpl::Create(std::move(request), identity_manager_,
-                               account_tracker_, signin_manager_,
-                               token_service_);
+                               account_tracker_, token_service_);
 }
 
 }  // namespace identity

services/identity/identity_service.h

@@ -22,7 +22,6 @@ class IdentityService : public service_manager::Service {
  public:
   IdentityService(IdentityManager* identity_manager,
                   AccountTrackerService* account_tracker,
-                  SigninManagerBase* signin_manager,
                   ProfileOAuth2TokenService* token_service,
                   service_manager::mojom::ServiceRequest request);
   ~IdentityService() override;
@@ -45,7 +44,6 @@ class IdentityService : public service_manager::Service {
 
   IdentityManager* identity_manager_;
   AccountTrackerService* account_tracker_;
-  SigninManagerBase* signin_manager_;
   ProfileOAuth2TokenService* token_service_;
 
   service_manager::BinderRegistry registry_;