[Sync] Split encryption state and logic out of PSS and SBHI.

components/browser_sync/profile_sync_service_unittest.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/browser_sync/profile_sync_service.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 55 matching lines @@
     DCHECK(!configure_called_.is_null());
     configure_called_.Run(reason);
   }
 
   void ReenableType(syncer::ModelType type) override {}
   void ResetDataTypeErrors() override {}
   void PurgeForMigration(syncer::ModelTypeSet undesired_types,
                          syncer::ConfigureReason reason) override {}
   void Stop() override{};
   ModelTypeSet GetActiveDataTypes() const override { return ModelTypeSet(); }
+  bool IsNigoriEnabled() const override { return true; }
   State state() const override { return syncer::DataTypeManager::CONFIGURED; }
 
  private:
   ConfigureCalled configure_called_;
 };
 
 ACTION_P(ReturnNewDataTypeManager, configure_called) {
   return new FakeDataTypeManager(configure_called);
 }
 
@@ skipping 157 matching lines @@
     syncer::SyncPrefs sync_prefs(prefs());
     sync_prefs.SetFirstSyncTime(base::Time::Now());
     sync_prefs.SetFirstSetupComplete();
     sync_prefs.SetKeepEverythingSynced(true);
     service_->Initialize();
   }
 
   void InitializeForFirstSync() { service_->Initialize(); }
 
   void TriggerPassphraseRequired() {
-    service_->OnPassphraseRequired(syncer::REASON_DECRYPTION,
-                                   sync_pb::EncryptedData());
+    service_->GetEncryptionObserverForTest()->OnPassphraseRequired(
+        syncer::REASON_DECRYPTION, sync_pb::EncryptedData());
   }
 
   void TriggerDataTypeStartRequest() {
     service_->OnDataTypeRequestsSyncStartup(syncer::BOOKMARKS);
   }
 
   void OnConfigureCalled(syncer::ConfigureReason configure_reason) {
     syncer::DataTypeManager::ConfigureResult result;
     result.status = syncer::DataTypeManager::OK;
     if (configure_reason == syncer::CONFIGURE_REASON_CATCH_UP)
@@ skipping 461 matching lines @@
   testing::Mock::VerifyAndClearExpectations(component_factory());
   EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
   syncer::DataTypeManager::ConfigureResult result;
   result.status = syncer::DataTypeManager::OK;
   service()->OnConfigureDone(result);
 
   // Simulate user entering encryption passphrase. Ensure that catch up
   // configure cycle is started (DTM::Configure is called with
   // CONFIGURE_REASON_CATCH_UP).
   const syncer::SyncEncryptionHandler::NigoriState nigori_state;
-  service()->OnLocalSetPassphraseEncryption(nigori_state);
+  service()->GetEncryptionObserverForTest()->OnLocalSetPassphraseEncryption(
+      nigori_state);
   EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
   EXPECT_TRUE(captured_callback.is_null());
 
   // Simulate configure successful. Ensure that SBH::ClearServerData is called.
   result.was_catch_up_configure = true;
   service()->OnConfigureDone(result);
   result.was_catch_up_configure = false;
   EXPECT_FALSE(captured_callback.is_null());
 
   // Once SBH::ClearServerData finishes successfully ensure that sync is
@@ skipping 24 matching lines @@
   InitializeForNthSync();
   testing::Mock::VerifyAndClearExpectations(component_factory());
   EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
   syncer::DataTypeManager::ConfigureResult result;
   result.status = syncer::DataTypeManager::OK;
   service()->OnConfigureDone(result);
 
   // Simulate user entering encryption passphrase. Ensure Configure was called
   // but don't let it continue.
   const syncer::SyncEncryptionHandler::NigoriState nigori_state;
-  service()->OnLocalSetPassphraseEncryption(nigori_state);
+  service()->GetEncryptionObserverForTest()->OnLocalSetPassphraseEncryption(
+      nigori_state);
   EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
 
   // Simulate browser restart. First configuration is a regular one.
   service()->Shutdown();
   syncer::SyncManager::ClearServerDataCallback captured_callback;
   ExpectSyncEngineCreationCaptureClearServerData(&captured_callback);
   ExpectDataTypeManagerCreation(
       1, GetRecordingConfigureCalledCallback(&configure_reason));
   service()->RequestStart();
   testing::Mock::VerifyAndClearExpectations(component_factory());
@@ skipping 31 matching lines @@
       switches::kSyncClearDataOnPassphraseEncryption);
   IssueTestTokens();
   CreateService(ProfileSyncService::AUTO_START);
   ExpectSyncEngineCreationCaptureClearServerData(&captured_callback);
   ExpectDataTypeManagerCreation(1, GetDefaultConfigureCalledCallback());
   InitializeForNthSync();
   testing::Mock::VerifyAndClearExpectations(component_factory());
 
   // Simulate user entering encryption passphrase.
   const syncer::SyncEncryptionHandler::NigoriState nigori_state;
-  service()->OnLocalSetPassphraseEncryption(nigori_state);
+  service()->GetEncryptionObserverForTest()->OnLocalSetPassphraseEncryption(
+      nigori_state);
   EXPECT_FALSE(captured_callback.is_null());
   captured_callback.Reset();
 
   // Simulate browser restart. First configuration is a regular one.
   service()->Shutdown();
   ExpectSyncEngineCreationCaptureClearServerData(&captured_callback);
   ExpectDataTypeManagerCreation(
       1, GetRecordingConfigureCalledCallback(&configure_reason));
   service()->RequestStart();
   testing::Mock::VerifyAndClearExpectations(component_factory());
@@ skipping 121 matching lines @@
   // Progress the controller to RUNNING first, which is how the service
   // determines whether a type is enabled.
   controller->StartAssociating(base::Bind(&DoNothing));
   controller->FinishStart(DataTypeController::OK_FIRST_RUN);
   service()->RegisterDataTypeController(std::move(controller));
   EXPECT_NE(nullptr, service()->GetOpenTabsUIDelegate());
 }
 
 }  // namespace
 }  // namespace browser_sync