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

components/sync/driver/glue/sync_backend_host_core.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 #define COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 17 matching lines @@
 #include "components/sync/engine/sync_encryption_handler.h"
 #include "url/gurl.h"
 
 namespace syncer {
 
 class SyncBackendHostImpl;
 
 class SyncBackendHostCore
     : public base::RefCountedThreadSafe<SyncBackendHostCore>,
       public base::trace_event::MemoryDumpProvider,
-      public SyncEncryptionHandler::Observer,
       public SyncManager::Observer,
       public TypeDebugInfoObserver {
  public:
   SyncBackendHostCore(const std::string& name,
                       const base::FilePath& sync_data_folder,
                       const base::WeakPtr<SyncBackendHostImpl>& backend);
 
   // MemoryDumpProvider implementation.
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   // SyncManager::Observer implementation.  The Core just acts like an air
   // traffic controller here, forwarding incoming messages to appropriate
   // landing threads.
   void OnSyncCycleCompleted(const SyncCycleSnapshot& snapshot) override;
   void OnInitializationComplete(
       const WeakHandle<JsBackend>& js_backend,
       const WeakHandle<DataTypeDebugInfoListener>& debug_info_listener,
       bool success,
       ModelTypeSet restored_types) override;
   void OnConnectionStatusChange(ConnectionStatus status) override;
   void OnActionableError(const SyncProtocolError& sync_error) override;
   void OnMigrationRequested(ModelTypeSet types) override;
   void OnProtocolEvent(const ProtocolEvent& event) override;
 
-  // SyncEncryptionHandler::Observer implementation.
-  void OnPassphraseRequired(
-      PassphraseRequiredReason reason,
-      const sync_pb::EncryptedData& pending_keys) override;
-  void OnPassphraseAccepted() override;
-  void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
-                               BootstrapTokenType type) override;
-  void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
-                               bool encrypt_everything) override;
-  void OnEncryptionComplete() override;
-  void OnCryptographerStateChanged(Cryptographer* cryptographer) override;
-  void OnPassphraseTypeChanged(PassphraseType type,
-                               base::Time passphrase_time) override;
-  void OnLocalSetPassphraseEncryption(
-      const SyncEncryptionHandler::NigoriState& nigori_state) override;
-
   // TypeDebugInfoObserver implementation
   void OnCommitCountersUpdated(ModelType type,
                                const CommitCounters& counters) override;
   void OnUpdateCountersUpdated(ModelType type,
                                const UpdateCounters& counters) override;
   void OnStatusCountersUpdated(ModelType type,
                                const StatusCounters& counters) override;
 
   // Forwards an invalidation state change to the sync manager.
   void DoOnInvalidatorStateChange(InvalidatorState state);
@@ skipping 111 matching lines @@
   const std::string name_;
 
   // Path of the folder that stores the sync data files.
   const base::FilePath sync_data_folder_;
 
   // Our parent SyncBackendHostImpl.
   WeakHandle<SyncBackendHostImpl> host_;
 
   // Non-null only between calls to DoInitialize() and DoShutdown().
   std::unique_ptr<SyncBackendRegistrar> registrar_;
+  std::unique_ptr<SyncEncryptionHandler::Observer> encryption_observer_proxy_;
 
   // The timer used to periodically call SaveChanges.
   std::unique_ptr<base::RepeatingTimer> save_changes_timer_;
 
   // Our encryptor, which uses Chrome's encryption functions.
   SystemEncryptor encryptor_;
 
   // The top-level syncapi entry point.  Lives on the sync thread.
   std::unique_ptr<SyncManager> sync_manager_;
 
@@ skipping 27 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<SyncBackendHostCore> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostCore);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DRIVER_GLUE_SYNC_BACKEND_HOST_CORE_H_