Use syncer::TestSyncService in SyncUsernameTestBase

While we're here, also use the default (preferred) constructor of
IdentityTestEnvironment. With this, there's no need anymore to create
TokenService, SigninManager, SigninClient, etc manually.

Bug: 859874
Change-Id: I765e0898ac232c70255a19bd05f2d2e694e6639e
Reviewed-on: https://chromium-review.googlesource.com/c/1326506Reviewed-by: Vaclav Brozek <vabr@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606494}

components/password_manager/core/browser/sync_username_test_base.cc

@@ -5,55 +5,14 @@
 #include "components/password_manager/core/browser/sync_username_test_base.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/signin/core/browser/signin_pref_names.h"
 
 using autofill::PasswordForm;
 
 namespace password_manager {
 
-SyncUsernameTestBase::LocalFakeSyncService::LocalFakeSyncService()
-    : syncing_passwords_(true) {}
+SyncUsernameTestBase::SyncUsernameTestBase() = default;
 
-SyncUsernameTestBase::LocalFakeSyncService::~LocalFakeSyncService() {}
-
-syncer::ModelTypeSet
-SyncUsernameTestBase::LocalFakeSyncService::GetPreferredDataTypes() const {
-  if (syncing_passwords_)
-    return syncer::ModelTypeSet(syncer::PASSWORDS);
-  return syncer::ModelTypeSet();
-}
-
-SyncUsernameTestBase::SyncUsernameTestBase()
-    : signin_client_(&prefs_),
-      token_service_(&prefs_),
-#if defined(OS_CHROMEOS)
-      signin_manager_(&signin_client_,
-                      &account_tracker_,
-                      nullptr /* signin_error_controller */),
-#else
-      signin_manager_(&signin_client_,
-                      &token_service_,
-                      &account_tracker_,
-                      nullptr, /* cookie_manager_service */
-                      nullptr, /* signin_error_controller */
-                      signin::AccountConsistencyMethod::kDisabled),
-#endif
-      gaia_cookie_manager_service_(&token_service_,
-                                   "sync_username_test_base",
-                                   &signin_client_),
-      identity_test_env_(&account_tracker_,
-                         &token_service_,
-                         &signin_manager_,
-                         &gaia_cookie_manager_service_) {
-  SigninManagerBase::RegisterProfilePrefs(prefs_.registry());
-  AccountTrackerService::RegisterPrefs(prefs_.registry());
-#if !defined(OS_CHROMEOS)
-  ProfileOAuth2TokenService::RegisterProfilePrefs(prefs_.registry());
-#endif
-  account_tracker_.Initialize(&prefs_, base::FilePath());
-}
-
-SyncUsernameTestBase::~SyncUsernameTestBase() {}
+SyncUsernameTestBase::~SyncUsernameTestBase() = default;
 
 void SyncUsernameTestBase::FakeSigninAs(const std::string& email) {
   // This method is called in a roll by some tests. Differently than
@@ -97,7 +56,9 @@ PasswordForm SyncUsernameTestBase::SimpleNonGaiaForm(const char* username,
 }
 
 void SyncUsernameTestBase::SetSyncingPasswords(bool syncing_passwords) {
-  sync_service_.set_syncing_passwords(syncing_passwords);
+  sync_service_.SetPreferredDataTypes(
+      syncing_passwords ? syncer::ModelTypeSet(syncer::PASSWORDS)
+                        : syncer::ModelTypeSet());
 }
 
 }  // namespace password_manager

components/password_manager/core/browser/sync_username_test_base.h

@@ -12,14 +12,7 @@
 
 #include "base/test/scoped_task_environment.h"
 #include "components/autofill/core/common/password_form.h"
-#include "components/signin/core/browser/account_tracker_service.h"
-#include "components/signin/core/browser/fake_gaia_cookie_manager_service.h"
-#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
-#include "components/signin/core/browser/signin_manager.h"
-#include "components/signin/core/browser/test_signin_client.h"
-#include "components/sync/base/model_type.h"
-#include "components/sync/driver/fake_sync_service.h"
-#include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/sync/driver/test_sync_service.h"
 #include "services/identity/public/cpp/identity_test_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -27,12 +20,6 @@ namespace password_manager {
 
 class SyncUsernameTestBase : public testing::Test {
  public:
-#if defined(OS_CHROMEOS)
-  using SigninManagerType = FakeSigninManagerBase;
-#else
-  using SigninManagerType = FakeSigninManager;
-#endif
-
   SyncUsernameTestBase();
   ~SyncUsernameTestBase() override;
 
@@ -51,38 +38,14 @@ class SyncUsernameTestBase : public testing::Test {
 
   const syncer::SyncService* sync_service() const { return &sync_service_; }
 
-  const SigninManagerBase* signin_manager() { return &signin_manager_; }
-
   const identity::IdentityManager* identity_manager() {
     return identity_test_env_.identity_manager();
   }
 
  private:
-  class LocalFakeSyncService : public syncer::FakeSyncService {
-   public:
-    LocalFakeSyncService();
-    ~LocalFakeSyncService() override;
-
-    // syncer::SyncService:
-    syncer::ModelTypeSet GetPreferredDataTypes() const override;
-
-    void set_syncing_passwords(bool syncing_passwords) {
-      syncing_passwords_ = syncing_passwords;
-    }
-
-   private:
-    bool syncing_passwords_;
-  };
-
   base::test::ScopedTaskEnvironment scoped_task_env_;
-  sync_preferences::TestingPrefServiceSyncable prefs_;
-  TestSigninClient signin_client_;
-  AccountTrackerService account_tracker_;
-  FakeProfileOAuth2TokenService token_service_;
-  SigninManagerType signin_manager_;
-  FakeGaiaCookieManagerService gaia_cookie_manager_service_;
   identity::IdentityTestEnvironment identity_test_env_;
-  LocalFakeSyncService sync_service_;
+  syncer::TestSyncService sync_service_;
 };
 
 }  // namespace password_manager