Eliminate FakeSigninManager

After recent changes, this class no longer introduces any functionality
over SigninManager and hence can be eliminated.

Bug: 796544
Change-Id: Iaea1bb16267dc54808cb4c736e6d3fd4b7edcb09
Reviewed-on: https://chromium-review.googlesource.com/c/1486337Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635531}

chrome/browser/DEPS

@@ -26,7 +26,6 @@ include_rules = [
   # see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/dgFLuxqZt1o/iEqkyoQQBwAJ for help and info.
   "!components/signin/core/browser/fake_profile_oauth2_token_service.h",
   "!components/signin/core/browser/profile_oauth2_token_service.h",
-  "!components/signin/core/browser/fake_signin_manager.h",
   "!components/signin/core/browser/signin_manager.h",
   "!components/signin/core/browser/signin_manager_base.h",
   "+content/public/browser",
@@ -261,10 +260,6 @@ specific_include_rules = {
   "browser_process_impl.cc": [
     "+ui/message_center/message_center.h",
   ],
-  "identity_test_environment_profile_adaptor\.cc": [
-    # The following is used to build FakeSigninManager instances for testing.
-    "+components/signin/core/browser/fake_signin_manager.h",
-  ],
   # To share values of UMA enums between product code and tests.
   "translate_manager_browsertest.cc": [
     "+services/network/initiator_lock_compatibility.h",

chrome/browser/signin/dice_response_handler_unittest.cc

@@ -24,11 +24,11 @@
 #include "components/signin/core/browser/dice_account_reconcilor_delegate.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/mutable_profile_oauth2_token_service_delegate.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_header_helper.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -103,7 +103,8 @@ class DiceResponseHandlerTest : public testing::Test,
         signin_manager_(&signin_client_,
                         &token_service_,
                         &account_tracker_service_,
-                        nullptr),
+                        nullptr,
+                        signin::AccountConsistencyMethod::kDisabled),
         cookie_service_(&token_service_, &signin_client_),
         identity_test_env_(&pref_service_,
                            &account_tracker_service_,
@@ -211,7 +212,7 @@ class DiceResponseHandlerTest : public testing::Test,
   FakeProfileOAuth2TokenService token_service_;
   AccountTrackerService account_tracker_service_;
   FakeAccountFetcherService account_fetcher_service_;
-  FakeSigninManager signin_manager_;
+  SigninManager signin_manager_;
   GaiaCookieManagerService cookie_service_;
   identity::IdentityTestEnvironment identity_test_env_;
   SigninErrorController signin_error_controller_;

chrome/browser/signin/identity_test_environment_profile_adaptor.cc

@@ -14,32 +14,9 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
 
 namespace {
 
-// TestingFactory that creates a FakeSigninManagerBase on ChromeOS and a
-// FakeSigninManager on all other platforms.
-std::unique_ptr<KeyedService> BuildFakeSigninManagerForTesting(
-    content::BrowserContext* context) {
-  Profile* profile = static_cast<Profile*>(context);
-  std::unique_ptr<SigninManagerBase> manager =
-#if defined(OS_CHROMEOS)
-      std::make_unique<SigninManagerBase>(
-          ChromeSigninClientFactory::GetForProfile(profile),
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-          AccountTrackerServiceFactory::GetForProfile(profile));
-#else
-      std::make_unique<FakeSigninManager>(
-          ChromeSigninClientFactory::GetForProfile(profile),
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
-          AccountTrackerServiceFactory::GetForProfile(profile),
-          GaiaCookieManagerServiceFactory::GetForProfile(profile));
-#endif
-  manager->Initialize(nullptr);
-  return manager;
-}
-
 // Testing factory that creates a FakeAccountFetcherService.
 std::unique_ptr<KeyedService> BuildFakeAccountFetcherService(
     content::BrowserContext* context) {
@@ -120,9 +97,7 @@ IdentityTestEnvironmentProfileAdaptor::GetIdentityTestEnvironmentFactories() {
   return {{AccountFetcherServiceFactory::GetInstance(),
            base::BindRepeating(&BuildFakeAccountFetcherService)},
           {ProfileOAuth2TokenServiceFactory::GetInstance(),
-           base::BindRepeating(&BuildFakeProfileOAuth2TokenService)},
-          {SigninManagerFactory::GetInstance(),
-           base::BindRepeating(&BuildFakeSigninManagerForTesting)}};
+           base::BindRepeating(&BuildFakeProfileOAuth2TokenService)}};
 }
 
 // static
@@ -149,12 +124,7 @@ IdentityTestEnvironmentProfileAdaptor::IdentityTestEnvironmentProfileAdaptor(
               AccountFetcherServiceFactory::GetForProfile(profile)),
           static_cast<FakeProfileOAuth2TokenService*>(
               ProfileOAuth2TokenServiceFactory::GetForProfile(profile)),
-#if defined(OS_CHROMEOS)
           SigninManagerFactory::GetForProfile(profile),
-#else
-          static_cast<FakeSigninManager*>(
-              SigninManagerFactory::GetForProfile(profile)),
-#endif
           GaiaCookieManagerServiceFactory::GetForProfile(profile),
           IdentityManagerFactory::GetForProfile(profile)) {
 }

components/signin/core/browser/BUILD.gn

@@ -222,8 +222,6 @@ static_library("internals_test_support") {
     "fake_account_fetcher_service.h",
     "fake_profile_oauth2_token_service.cc",
     "fake_profile_oauth2_token_service.h",
-    "fake_signin_manager.cc",
-    "fake_signin_manager.h",
 
     # TODO(https://crbug.com/907782): Move list_accounts_test_utils to
     # //services/identity/public/cpp once FakeGCMS no longer depends on it.

components/signin/core/browser/fake_signin_manager.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 "components/signin/core/browser/fake_signin_manager.h"
-
-#include "base/callback_helpers.h"
-#include "build/build_config.h"
-#include "components/prefs/pref_service.h"
-#include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/signin_client.h"
-#include "components/signin/core/browser/signin_metrics.h"
-#include "components/signin/core/browser/signin_pref_names.h"
-
-#if !defined(OS_CHROMEOS)
-
-FakeSigninManager::FakeSigninManager(
-    SigninClient* client,
-    ProfileOAuth2TokenService* token_service,
-    AccountTrackerService* account_tracker_service,
-    GaiaCookieManagerService* cookie_manager_service)
-    : FakeSigninManager(client,
-                        token_service,
-                        account_tracker_service,
-                        cookie_manager_service,
-                        signin::AccountConsistencyMethod::kDisabled) {}
-
-FakeSigninManager::FakeSigninManager(
-    SigninClient* client,
-    ProfileOAuth2TokenService* token_service,
-    AccountTrackerService* account_tracker_service,
-    GaiaCookieManagerService* cookie_manager_service,
-    signin::AccountConsistencyMethod account_consistency)
-    : SigninManager(client,
-                    token_service,
-                    account_tracker_service,
-                    cookie_manager_service,
-                    account_consistency) {}
-
-FakeSigninManager::~FakeSigninManager() {}
-
-#endif  // !defined (OS_CHROMEOS)

components/signin/core/browser/fake_signin_manager.h

-// 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.
-
-#ifndef COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_SIGNIN_MANAGER_H_
-#define COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_SIGNIN_MANAGER_H_
-
-#include <memory>
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "build/build_config.h"
-#include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/core/browser/signin_metrics.h"
-
-// SigninManager to use for testing.
-
-#if !defined(OS_CHROMEOS)
-
-// A signin manager that bypasses actual authentication routines with servers
-// and accepts the credentials provided to StartSignIn.
-class FakeSigninManager : public SigninManager {
- public:
-  FakeSigninManager(SigninClient* client,
-                    ProfileOAuth2TokenService* token_service,
-                    AccountTrackerService* account_tracker_service,
-                    GaiaCookieManagerService* cookie_manager_service);
-
-  FakeSigninManager(SigninClient* client,
-                    ProfileOAuth2TokenService* token_service,
-                    AccountTrackerService* account_tracker_service,
-                    GaiaCookieManagerService* cookie_manager_service,
-                    signin::AccountConsistencyMethod account_consistency);
-
-  ~FakeSigninManager() override;
-};
-
-#endif  // !defined (OS_CHROMEOS)
-
-#endif  // COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_SIGNIN_MANAGER_H_

components/signin/core/browser/signin_manager.h

@@ -136,7 +136,6 @@ class SigninManager : public SigninManagerBase,
       SigninClient::SignoutDecision signout_decision);
 
  private:
-  friend class FakeSigninManager;
   friend class identity::IdentityManager;
   FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, Prohibited);
   FRIEND_TEST_ALL_PREFIXES(SigninManagerTest, TestAlternateWildcard);

components/signin/core/browser/signin_manager_base.h

@@ -63,7 +63,6 @@ class SigninManagerBase : public KeyedService {
    private:
     // SigninManagers that fire notifications.
     friend class SigninManager;
-    friend class FakeSigninManager;
   };
 
 // On non-ChromeOS platforms, SigninManagerBase should only be instantiated
@@ -175,9 +174,6 @@ class SigninManagerBase : public KeyedService {
   base::ObserverList<Observer, true>::Unchecked observer_list_;
 
  private:
-  friend class FakeSigninManagerBase;
-  friend class FakeSigninManager;
-
   // Added only to allow SigninManager to call the SigninManagerBase
   // constructor while disallowing any ad-hoc subclassing of
   // SigninManagerBase.

components/signin/ios/browser/account_consistency_service_unittest.mm

@@ -14,10 +14,10 @@
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/account_reconcilor_delegate.h"
 #include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
+#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_pref_names.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
@@ -166,9 +166,9 @@ class AccountConsistencyServiceTest : public PlatformTest {
     account_fetcher_service_.Initialize(
         signin_client_.get(), token_service_.get(), &account_tracker_service_,
         std::make_unique<TestImageDecoder>());
-    signin_manager_.reset(
-        new FakeSigninManager(signin_client_.get(), token_service_.get(),
-                              &account_tracker_service_, nullptr));
+    signin_manager_.reset(new SigninManager(
+        signin_client_.get(), token_service_.get(), &account_tracker_service_,
+        nullptr, signin::AccountConsistencyMethod::kDisabled));
     signin_manager_->Initialize(nullptr);
     identity_test_env_.reset(new identity::IdentityTestEnvironment(
         &prefs_, &account_tracker_service_, &account_fetcher_service_,
@@ -287,7 +287,7 @@ class AccountConsistencyServiceTest : public PlatformTest {
   std::unique_ptr<AccountConsistencyService> account_consistency_service_;
   std::unique_ptr<TestSigninClient> signin_client_;
   std::unique_ptr<FakeProfileOAuth2TokenService> token_service_;
-  std::unique_ptr<FakeSigninManager> signin_manager_;
+  std::unique_ptr<SigninManager> signin_manager_;
   std::unique_ptr<CustomGaiaCookieManagerService> gaia_cookie_manager_service_;
   std::unique_ptr<MockAccountReconcilor> account_reconcilor_;
   scoped_refptr<HostContentSettingsMap> settings_map_;

ios/chrome/browser/signin/identity_test_environment_chrome_browser_state_adaptor.cc

@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ -24,22 +23,6 @@
 
 namespace {
 
-std::unique_ptr<KeyedService> BuildFakeSigninManager(
-    web::BrowserState* browser_state) {
-  ios::ChromeBrowserState* chrome_browser_state =
-      ios::ChromeBrowserState::FromBrowserState(browser_state);
-  std::unique_ptr<SigninManager> manager(new FakeSigninManager(
-      SigninClientFactory::GetForBrowserState(chrome_browser_state),
-      ProfileOAuth2TokenServiceFactory::GetForBrowserState(
-          chrome_browser_state),
-      ios::AccountTrackerServiceFactory::GetForBrowserState(
-          chrome_browser_state),
-      ios::GaiaCookieManagerServiceFactory::GetForBrowserState(
-          chrome_browser_state)));
-  manager->Initialize(nullptr);
-  return manager;
-}
-
 std::unique_ptr<KeyedService> BuildFakeOAuth2TokenService(
     web::BrowserState* context) {
   ios::ChromeBrowserState* browser_state =
@@ -88,9 +71,7 @@ TestChromeBrowserState::TestingFactories GetIdentityTestEnvironmentFactories(
           {ProfileOAuth2TokenServiceFactory::GetInstance(),
            base::BindRepeating(use_ios_token_service_delegate
                                    ? &BuildFakeOAuth2TokenServiceWithIOSDelegate
-                                   : &BuildFakeOAuth2TokenService)},
-          {ios::SigninManagerFactory::GetInstance(),
-           base::BindRepeating(&BuildFakeSigninManager)}};
+                                   : &BuildFakeOAuth2TokenService)}};
 }
 
 }  // namespace
@@ -165,8 +146,7 @@ IdentityTestEnvironmentChromeBrowserStateAdaptor::
           static_cast<FakeProfileOAuth2TokenService*>(
               ProfileOAuth2TokenServiceFactory::GetForBrowserState(
                   browser_state)),
-          static_cast<FakeSigninManager*>(
-              ios::SigninManagerFactory::GetForBrowserState(browser_state)),
+          ios::SigninManagerFactory::GetForBrowserState(browser_state),
           ios::GaiaCookieManagerServiceFactory::GetForBrowserState(
               browser_state),
           IdentityManagerFactory::GetForBrowserState(browser_state)) {}

services/identity/identity_manager_impl_unittest.cc

@@ -9,7 +9,7 @@
 #include "components/signin/core/browser/account_info.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "services/identity/identity_service.h"
@@ -25,12 +25,6 @@
 namespace identity {
 namespace {
 
-#if defined(OS_CHROMEOS)
-using SigninManagerForTest = SigninManagerBase;
-#else
-using SigninManagerForTest = FakeSigninManager;
-#endif  // OS_CHROMEOS
-
 const char kTestGaiaId[] = "dummyId";
 const char kTestEmail[] = "me@dummy.com";
 const char kTestRefreshToken[] = "dummy-refresh-token";
@@ -47,7 +41,8 @@ class IdentityManagerImplTest : public testing::Test {
         signin_manager_(&signin_client_,
                         &token_service_,
                         &account_tracker_,
-                        nullptr),
+                        nullptr,
+                        signin::AccountConsistencyMethod::kDisabled),
 #endif
         service_(
             &account_tracker_,
@@ -153,7 +148,11 @@ class IdentityManagerImplTest : public testing::Test {
   AccountTrackerService account_tracker_;
   TestSigninClient signin_client_;
   FakeProfileOAuth2TokenService token_service_;
-  SigninManagerForTest signin_manager_;
+#if defined(OS_CHROMEOS)
+  SigninManagerBase signin_manager_;
+#else
+  SigninManager signin_manager_;
+#endif
 
   service_manager::TestConnectorFactory test_connector_factory_;
   IdentityService service_;

services/identity/public/cpp/identity_manager_unittest.cc

@@ -20,8 +20,8 @@
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/list_accounts_test_utils.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_switches.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
@@ -43,12 +43,6 @@
 namespace identity {
 namespace {
 
-#if defined(OS_CHROMEOS)
-using SigninManagerForTest = SigninManagerBase;
-#else
-using SigninManagerForTest = FakeSigninManager;
-#endif  // OS_CHROMEOS
-
 const char kTestGaiaId[] = "dummyId";
 const char kTestGaiaId2[] = "dummyId2";
 const char kTestGaiaId3[] = "dummyId3";
@@ -353,7 +347,7 @@ class IdentityManagerTest : public testing::Test {
   }
   AccountTrackerServiceForTest* account_tracker() { return &account_tracker_; }
   FakeAccountFetcherService* account_fetcher() { return &account_fetcher_; }
-  SigninManagerForTest* signin_manager() { return signin_manager_.get(); }
+  SigninManagerBase* signin_manager() { return signin_manager_.get(); }
   CustomFakeProfileOAuth2TokenService* token_service() {
     return &token_service_;
   }
@@ -393,7 +387,7 @@ class IdentityManagerTest : public testing::Test {
     signin_manager_ = std::make_unique<SigninManagerBase>(
         &signin_client_, &token_service_, &account_tracker_);
 #else
-    signin_manager_ = std::make_unique<FakeSigninManager>(
+    signin_manager_ = std::make_unique<SigninManager>(
         &signin_client_, &token_service_, &account_tracker_,
         &gaia_cookie_manager_service_, account_consistency);
 #endif
@@ -476,7 +470,7 @@ class IdentityManagerTest : public testing::Test {
   CustomFakeProfileOAuth2TokenService token_service_;
   network::TestURLLoaderFactory test_url_loader_factory_;
   GaiaCookieManagerService gaia_cookie_manager_service_;
-  std::unique_ptr<SigninManagerForTest> signin_manager_;
+  std::unique_ptr<SigninManagerBase> signin_manager_;
   std::unique_ptr<IdentityManager> identity_manager_;
   std::unique_ptr<TestIdentityManagerObserver> identity_manager_observer_;
   std::unique_ptr<TestIdentityManagerDiagnosticsObserver>
@@ -1449,7 +1443,8 @@ TEST_F(
   RecreateIdentityManager();
   signin_manager_observer.set_identity_manager(identity_manager());
 
-  signin_manager()->OnExternalSigninCompleted(kTestEmail);
+  SigninManager::FromSigninManagerBase(signin_manager())
+      ->OnExternalSigninCompleted(kTestEmail);
 
   run_loop.Run();
 

services/identity/public/cpp/identity_test_environment.cc

@@ -12,8 +12,8 @@
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/fake_signin_manager.h"
 #include "components/signin/core/browser/gaia_cookie_manager_service.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/test_signin_client.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
@@ -52,7 +52,7 @@ class IdentityManagerDependenciesOwner {
 
   FakeAccountFetcherService* account_fetcher_service();
 
-  SigninManagerForTest* signin_manager();
+  SigninManagerBase* signin_manager();
 
   FakeProfileOAuth2TokenService* token_service();
 
@@ -75,7 +75,11 @@ class IdentityManagerDependenciesOwner {
   AccountTrackerService account_tracker_;
   FakeAccountFetcherService account_fetcher_;
   FakeProfileOAuth2TokenService token_service_;
-  SigninManagerForTest signin_manager_;
+#if defined(OS_CHROMEOS)
+  SigninManagerBase signin_manager_;
+#else
+  SigninManager signin_manager_;
+#endif
   std::unique_ptr<GaiaCookieManagerService> gaia_cookie_manager_service_;
 
   DISALLOW_COPY_AND_ASSIGN(IdentityManagerDependenciesOwner);
@@ -149,7 +153,7 @@ IdentityManagerDependenciesOwner::account_fetcher_service() {
   return &account_fetcher_;
 }
 
-SigninManagerForTest* IdentityManagerDependenciesOwner::signin_manager() {
+SigninManagerBase* IdentityManagerDependenciesOwner::signin_manager() {
   return &signin_manager_;
 }
 
@@ -203,7 +207,7 @@ IdentityTestEnvironment::IdentityTestEnvironment(
     AccountTrackerService* account_tracker_service,
     FakeAccountFetcherService* account_fetcher_service,
     FakeProfileOAuth2TokenService* token_service,
-    SigninManagerForTest* signin_manager,
+    SigninManagerBase* signin_manager,
     GaiaCookieManagerService* gaia_cookie_manager_service,
     network::TestURLLoaderFactory* test_url_loader_factory)
     : IdentityTestEnvironment(pref_service,
@@ -221,7 +225,7 @@ IdentityTestEnvironment::IdentityTestEnvironment(
     AccountTrackerService* account_tracker_service,
     FakeAccountFetcherService* account_fetcher_service,
     FakeProfileOAuth2TokenService* token_service,
-    SigninManagerForTest* signin_manager,
+    SigninManagerBase* signin_manager,
     GaiaCookieManagerService* gaia_cookie_manager_service,
     IdentityManager* identity_manager,
     network::TestURLLoaderFactory* test_url_loader_factory)
@@ -240,7 +244,7 @@ IdentityTestEnvironment::IdentityTestEnvironment(
     AccountTrackerService* account_tracker_service,
     FakeAccountFetcherService* account_fetcher_service,
     FakeProfileOAuth2TokenService* token_service,
-    SigninManagerForTest* signin_manager,
+    SigninManagerBase* signin_manager,
     GaiaCookieManagerService* gaia_cookie_manager_service,
     network::TestURLLoaderFactory* test_url_loader_factory,
     std::unique_ptr<IdentityManagerDependenciesOwner> dependencies_owner,

services/identity/public/cpp/identity_test_environment.h

@@ -13,11 +13,11 @@
 class AccountTrackerService;
 class FakeAccountFetcherService;
 class FakeProfileOAuth2TokenService;
-class FakeSigninManager;
 class GaiaCookieManagerService;
 class IdentityTestEnvironmentChromeBrowserStateAdaptor;
 class IdentityTestEnvironmentProfileAdaptor;
 class PrefService;
+class SigninManager;
 class TestSigninClient;
 
 namespace sync_preferences {
@@ -30,14 +30,6 @@ class TestURLLoaderFactory;
 
 namespace identity {
 
-namespace {
-#if defined(OS_CHROMEOS)
-using SigninManagerForTest = SigninManagerBase;
-#else
-using SigninManagerForTest = FakeSigninManager;
-#endif  // OS_CHROMEOS
-}  // namespace
-
 class IdentityManagerDependenciesOwner;
 class TestIdentityManagerObserver;
 
@@ -90,7 +82,7 @@ class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
       AccountTrackerService* account_tracker_service,
       FakeAccountFetcherService* account_fetcher_service,
       FakeProfileOAuth2TokenService* token_service,
-      SigninManagerForTest* signin_manager,
+      SigninManagerBase* signin_manager,
       GaiaCookieManagerService* gaia_cookie_manager_service,
       network::TestURLLoaderFactory* test_url_loader_factory = nullptr);
 
@@ -327,7 +319,7 @@ class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
       AccountTrackerService* account_tracker_service,
       FakeAccountFetcherService* account_fetcher_service,
       FakeProfileOAuth2TokenService* token_service,
-      SigninManagerForTest* signin_manager,
+      SigninManagerBase* signin_manager,
       GaiaCookieManagerService* gaia_cookie_manager_service,
       IdentityManager* identity_manager,
       network::TestURLLoaderFactory* test_url_loader_factory = nullptr);
@@ -348,7 +340,7 @@ class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
       AccountTrackerService* account_tracker_service,
       FakeAccountFetcherService* account_fetcher_service,
       FakeProfileOAuth2TokenService* token_service,
-      SigninManagerForTest* signin_manager,
+      SigninManagerBase* signin_manager,
       GaiaCookieManagerService* gaia_cookie_manager_service,
       network::TestURLLoaderFactory* test_url_loader_factory,
       std::unique_ptr<IdentityManagerDependenciesOwner> dependencies_owner,
@@ -380,7 +372,7 @@ class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
   AccountTrackerService* account_tracker_service_ = nullptr;
   FakeAccountFetcherService* account_fetcher_service_ = nullptr;
   FakeProfileOAuth2TokenService* token_service_ = nullptr;
-  SigninManagerForTest* signin_manager_ = nullptr;
+  SigninManagerBase* signin_manager_ = nullptr;
   GaiaCookieManagerService* gaia_cookie_manager_service_ = nullptr;
 
   // Used to set fake responses for cookie-related requests.

services/identity/public/cpp/primary_account_mutator_unittest.cc

@@ -443,9 +443,9 @@ TEST_F(PrimaryAccountMutatorTest, ClearPrimaryAccount_Default) {
       signin_metrics::SIGNOUT_TEST,
       signin_metrics::SignoutDelete::IGNORE_METRIC));
 
-  // The underlying SigninManager in IdentityTestEnvironment (FakeSigninManager)
-  // will be created with signin::AccountConsistencyMethod::kDisabled, which
-  // should result in ClearPrimaryAccount() removing all the tokens.
+  // The underlying SigninManager in IdentityTestEnvironment will be created
+  // with signin::AccountConsistencyMethod::kDisabled, which should result in
+  // ClearPrimaryAccount() removing all the tokens.
   EXPECT_FALSE(identity_manager->HasPrimaryAccount());
   EXPECT_FALSE(identity_manager->HasAccountWithRefreshToken(
       primary_account_info.account_id));