[sync] Remove unused IsNigoriEnabled()

It was only used for a DCHECK that always returned true and was not
important anyway.

Change-Id: I87fd0a856420e035cbd6381f79fa9cdd04f87b1f
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2467520
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Auto-Submit: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: Maksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#816508}

components/sync/driver/data_type_manager.h

@@ -102,9 +102,6 @@ class DataTypeManager {
   // KEEP_DATA was used when stopping (or if the datatype was never started).
   virtual ModelTypeSet GetPurgedDataTypes() const = 0;
 
-  // Whether or not we are syncing encryption keys.
-  virtual bool IsNigoriEnabled() const = 0;
-
   // The current state of the data type manager.
   virtual State state() const = 0;
 };

components/sync/driver/data_type_manager_impl.cc

@@ -900,10 +900,6 @@ ModelTypeSet DataTypeManagerImpl::GetPurgedDataTypes() const {
   return purged_types;
 }
 
-bool DataTypeManagerImpl::IsNigoriEnabled() const {
-  return downloaded_types_.Has(NIGORI);
-}
-
 DataTypeManager::State DataTypeManagerImpl::state() const {
   return state_;
 }

components/sync/driver/data_type_manager_impl.h

@@ -57,7 +57,6 @@ class DataTypeManagerImpl : public DataTypeManager,
   void Stop(ShutdownReason reason) override;
   ModelTypeSet GetActiveDataTypes() const override;
   ModelTypeSet GetPurgedDataTypes() const override;
-  bool IsNigoriEnabled() const override;
   State state() const override;
 
   // |ModelAssociationManagerDelegate| implementation.

components/sync/driver/data_type_manager_mock.h

@@ -24,7 +24,6 @@ class DataTypeManagerMock : public DataTypeManager {
   MOCK_METHOD0(controllers, const DataTypeController::TypeMap&());
   MOCK_CONST_METHOD0(GetActiveDataTypes, ModelTypeSet());
   MOCK_CONST_METHOD0(GetPurgedDataTypes, ModelTypeSet());
-  MOCK_CONST_METHOD0(IsNigoriEnabled, bool());
   MOCK_CONST_METHOD0(state, State());
 
  private:

components/sync/driver/profile_sync_service.cc

@@ -2001,7 +2001,6 @@ void ProfileSyncService::OnSetupInProgressHandleDestroyed() {
 
 void ProfileSyncService::ReconfigureDueToPassphrase(ConfigureReason reason) {
   if (CanConfigureDataTypes(/*bypass_setup_in_progress_check=*/false)) {
-    DCHECK(data_type_manager_->IsNigoriEnabled());
     ConfigureDataTypeManager(reason);
   }
   // Notify observers that the passphrase status may have changed, regardless of

components/sync/driver/profile_sync_service_startup_unittest.cc

@@ -341,7 +341,6 @@ TEST_F(ProfileSyncServiceStartupTest, StartNormal) {
   CreateSyncService(ProfileSyncService::MANUAL_START);
   SetUpFakeSyncEngine();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManagerMock();
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   // Since all conditions for starting Sync are already fulfilled, calling
   // Initialize should immediately create and initialize the engine and
@@ -366,7 +365,6 @@ TEST_F(ProfileSyncServiceStartupTest, StopSync) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManagerMock();
   ON_CALL(*data_type_manager, state())
       .WillByDefault(Return(DataTypeManager::CONFIGURED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   sync_service()->Initialize();
 
@@ -392,7 +390,6 @@ TEST_F(ProfileSyncServiceStartupTest, DisableSync) {
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManagerMock();
   ON_CALL(*data_type_manager, state())
       .WillByDefault(Return(DataTypeManager::CONFIGURED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   sync_service()->Initialize();
   ASSERT_TRUE(sync_service()->IsSyncFeatureActive());
@@ -434,7 +431,6 @@ TEST_F(ProfileSyncServiceStartupTest, StartRecoverDatatypePrefs) {
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   ON_CALL(*data_type_manager, state())
       .WillByDefault(Return(DataTypeManager::CONFIGURED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   sync_service()->Initialize();
 
@@ -459,7 +455,6 @@ TEST_F(ProfileSyncServiceStartupTest, StartDontRecoverDatatypePrefs) {
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   ON_CALL(*data_type_manager, state())
       .WillByDefault(Return(DataTypeManager::CONFIGURED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   sync_service()->Initialize();
 
@@ -496,7 +491,6 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   ON_CALL(*data_type_manager, state())
       .WillByDefault(Return(DataTypeManager::CONFIGURED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
 
   // Initialize() should be enough to kick off Sync startup (which is instant in
   // this test).
@@ -567,7 +561,6 @@ TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
                                       base::BindRepeating(&SetError), result)));
   EXPECT_CALL(*data_type_manager, state())
       .WillOnce(Return(DataTypeManager::STOPPED));
-  ON_CALL(*data_type_manager, IsNigoriEnabled()).WillByDefault(Return(true));
   sync_service()->Initialize();
   EXPECT_TRUE(sync_service()->HasUnrecoverableError());
   EXPECT_EQ(SyncService::DisableReasonSet(

components/sync/driver/profile_sync_service_unittest.cc

@@ -84,7 +84,6 @@ class FakeDataTypeManager : public DataTypeManager {
   void Stop(ShutdownReason reason) override {}
   ModelTypeSet GetActiveDataTypes() const override { return desired_types_; }
   ModelTypeSet GetPurgedDataTypes() const override { return ModelTypeSet(); }
-  bool IsNigoriEnabled() const override { return true; }
   State state() const override { return state_; }
 
  private: