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

components/sync/driver/glue/sync_backend_host_core.cc

 // Copyright 2013 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/sync/driver/glue/sync_backend_host_core.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 96 matching lines @@
     DoDestroySyncManager(STOP_SYNC);
     host_.Call(FROM_HERE,
                &SyncBackendHostImpl::HandleInitializationFailureOnFrontendLoop);
     return;
   }
 
   // Register for encryption related changes now. We have to do this before
   // the initializing downloading control types or initializing the encryption
   // handler in order to receive notifications triggered during encryption
   // startup.
-  sync_manager_->GetEncryptionHandler()->AddObserver(this);
+  DCHECK(encryption_observer_proxy_);
+  sync_manager_->GetEncryptionHandler()->AddObserver(
+      encryption_observer_proxy_.get());
 
   // Sync manager initialization is complete, so we can schedule recurring
   // SaveChanges.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&SyncBackendHostCore::StartSavingChanges,
                             weak_ptr_factory_.GetWeakPtr()));
 
   // Hang on to these for a while longer.  We're not ready to hand them back to
   // the UI thread yet.
   js_backend_ = js_backend;
@@ skipping 40 matching lines @@
       base::Closure());
 }
 
 void SyncBackendHostCore::OnConnectionStatusChange(ConnectionStatus status) {
   DCHECK(thread_checker_.CalledOnValidThread());
   host_.Call(FROM_HERE,
              &SyncBackendHostImpl::HandleConnectionStatusChangeOnFrontendLoop,
              status);
 }
 
-void SyncBackendHostCore::OnPassphraseRequired(
-    PassphraseRequiredReason reason,
-    const sync_pb::EncryptedData& pending_keys) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  host_.Call(FROM_HERE, &SyncBackendHostImpl::NotifyPassphraseRequired, reason,
-             pending_keys);
-}
-
-void SyncBackendHostCore::OnPassphraseAccepted() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  host_.Call(FROM_HERE, &SyncBackendHostImpl::NotifyPassphraseAccepted);
-}
-
-void SyncBackendHostCore::OnBootstrapTokenUpdated(
-    const std::string& bootstrap_token,
-    BootstrapTokenType type) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  host_.Call(FROM_HERE, &SyncBackendHostImpl::PersistEncryptionBootstrapToken,
-             bootstrap_token, type);
-}
-
-void SyncBackendHostCore::OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
-                                                  bool encrypt_everything) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // NOTE: We're in a transaction.
-  host_.Call(FROM_HERE, &SyncBackendHostImpl::NotifyEncryptedTypesChanged,
-             encrypted_types, encrypt_everything);
-}
-
-void SyncBackendHostCore::OnEncryptionComplete() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // NOTE: We're in a transaction.
-  host_.Call(FROM_HERE, &SyncBackendHostImpl::NotifyEncryptionComplete);
-}
-
-void SyncBackendHostCore::OnCryptographerStateChanged(
-    Cryptographer* cryptographer) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  // Do nothing.
-}
-
-void SyncBackendHostCore::OnPassphraseTypeChanged(PassphraseType type,
-                                                  base::Time passphrase_time) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  host_.Call(FROM_HERE,
-             &SyncBackendHostImpl::HandlePassphraseTypeChangedOnFrontendLoop,
-             type, passphrase_time);
-}
-
-void SyncBackendHostCore::OnLocalSetPassphraseEncryption(
-    const SyncEncryptionHandler::NigoriState& nigori_state) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  host_.Call(
-      FROM_HERE,
-      &SyncBackendHostImpl::HandleLocalSetPassphraseEncryptionOnFrontendLoop,
-      nigori_state);
-}
-
 void SyncBackendHostCore::OnCommitCountersUpdated(
     ModelType type,
     const CommitCounters& counters) {
   DCHECK(thread_checker_.CalledOnValidThread());
   host_.Call(
       FROM_HERE,
       &SyncBackendHostImpl::HandleDirectoryCommitCountersUpdatedOnFrontendLoop,
       type, counters);
 }
 
@@ skipping 96 matching lines @@
   // Make sure that the directory exists before initializing the backend.
   // If it already exists, this will do no harm.
   if (!base::CreateDirectory(sync_data_folder_)) {
     DLOG(FATAL) << "Sync Data directory creation failed.";
   }
 
   // Load the previously persisted set of invalidation versions into memory.
   last_invalidation_versions_ = params.invalidation_versions;
 
   DCHECK(!registrar_);
+  DCHECK(params.registrar);
   registrar_ = std::move(params.registrar);
-  DCHECK(registrar_);
+
+  DCHECK(!encryption_observer_proxy_);
+  DCHECK(params.encryption_observer_proxy);
+  encryption_observer_proxy_ = std::move(params.encryption_observer_proxy);
 
   sync_manager_ = params.sync_manager_factory->CreateSyncManager(name_);
   sync_manager_->AddObserver(this);
 
   SyncManager::InitArgs args;
   args.database_location = sync_data_folder_;
   args.event_handler = params.event_handler;
   args.service_url = params.service_url;
   args.enable_local_sync_backend = params.enable_local_sync_backend;
   args.local_sync_backend_folder = params.local_sync_backend_folder;
@@ skipping 280 matching lines @@
 }
 
 void SyncBackendHostCore::ClearServerDataDone(
     const base::Closure& frontend_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop,
              frontend_callback);
 }
 
 }  // namespace syncer