Move fake GetUserSettings() impl from SyncService to [Fake|Test]SyncService

Bug: 884159
Change-Id: Idb63eef4c7e6786ac589fc39bd637478c8b7ff8b
Reviewed-on: https://chromium-review.googlesource.com/c/1333370Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607618}

components/sync/driver/fake_sync_service.cc

@@ -19,6 +19,14 @@ FakeSyncService::FakeSyncService()
 
 FakeSyncService::~FakeSyncService() = default;
 
+syncer::SyncUserSettings* FakeSyncService::GetUserSettings() {
+  return nullptr;
+}
+
+const syncer::SyncUserSettings* FakeSyncService::GetUserSettings() const {
+  return nullptr;
+}
+
 int FakeSyncService::GetDisableReasons() const {
   return DISABLE_REASON_NOT_SIGNED_IN;
 }

components/sync/driver/fake_sync_service.h

@@ -24,6 +24,8 @@ class FakeSyncService : public SyncService {
 
   // Dummy methods.
   // SyncService implementation.
+  syncer::SyncUserSettings* GetUserSettings() override;
+  const syncer::SyncUserSettings* GetUserSettings() const override;
   int GetDisableReasons() const override;
   TransportState GetTransportState() const override;
   AccountInfo GetAuthenticatedAccountInfo() const override;

components/sync/driver/sync_service.cc

@@ -13,14 +13,6 @@ SyncSetupInProgressHandle::~SyncSetupInProgressHandle() {
   on_destroy_.Run();
 }
 
-SyncUserSettings* SyncService::GetUserSettings() {
-  return nullptr;
-}
-
-const SyncUserSettings* SyncService::GetUserSettings() const {
-  return nullptr;
-}
-
 bool SyncService::IsSyncFeatureEnabled() const {
   // Note: IsFirstSetupComplete() shouldn't usually be true if we don't have a
   // primary account, but it could happen if the account changes from primary to

components/sync/driver/sync_service.h

@@ -123,9 +123,8 @@ class SyncService : public DataTypeEncryptionHandler, public KeyedService {
 
   ~SyncService() override {}
 
-  // TODO(crbug.com/884159): Remove the default impls and migrate tests over.
-  virtual SyncUserSettings* GetUserSettings();
-  virtual const SyncUserSettings* GetUserSettings() const;
+  virtual SyncUserSettings* GetUserSettings() = 0;
+  virtual const SyncUserSettings* GetUserSettings() const = 0;
 
   //////////////////////////////////////////////////////////////////////////////
   // BASIC STATE ACCESS

components/sync/driver/test_sync_service.cc

@@ -94,6 +94,14 @@ void TestSyncService::SetNonEmptyLastCycleSnapshot() {
   SetLastCycleSnapshot(MakeDefaultCycleSnapshot());
 }
 
+syncer::SyncUserSettings* TestSyncService::GetUserSettings() {
+  return nullptr;
+}
+
+const syncer::SyncUserSettings* TestSyncService::GetUserSettings() const {
+  return nullptr;
+}
+
 int TestSyncService::GetDisableReasons() const {
   return disable_reasons_;
 }

components/sync/driver/test_sync_service.h

@@ -41,6 +41,8 @@ class TestSyncService : public SyncService {
   void SetNonEmptyLastCycleSnapshot();
 
   // SyncService implementation.
+  syncer::SyncUserSettings* GetUserSettings() override;
+  const syncer::SyncUserSettings* GetUserSettings() const override;
   int GetDisableReasons() const override;
   TransportState GetTransportState() const override;
   bool IsLocalSyncEnabled() const override;