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

components/sync/engine/sync_encryption_handler.h

 // Copyright 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.
 
 #ifndef COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_
 #define COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_
 
 #include <string>
 
 #include "base/time/time.h"
@@ skipping 30 matching lines @@
 // methods must be invoked on the sync thread.
 class SyncEncryptionHandler {
  public:
   class NigoriState;
 
   // All Observer methods are done synchronously from within a transaction and
   // on the sync thread.
   class Observer {
    public:
     Observer();
+    virtual ~Observer();
 
     // Called when user interaction is required to obtain a valid passphrase.
     // - If the passphrase is required for encryption, |reason| will be
     //   REASON_ENCRYPTION.
     // - If the passphrase is required for the decryption of data that has
     //   already been encrypted, |reason| will be REASON_DECRYPTION.
     // - If the passphrase is required because decryption failed, and a new
     //   passphrase is required, |reason| will be REASON_SET_PASSPHRASE_FAILED.
     //
     // |pending_keys| is a copy of the cryptographer's pending keys, that may be
@@ skipping 48 matching lines @@
     virtual void OnPassphraseTypeChanged(PassphraseType type,
                                          base::Time passphrase_time) = 0;
 
     // The user has set a passphrase using this device.
     //
     // |nigori_state| can be used to restore nigori state across
     // SyncEncryptionHandlerImpl lifetimes. See also SyncEncryptionHandlerImpl's
     // RestoredNigori method.
     virtual void OnLocalSetPassphraseEncryption(
         const NigoriState& nigori_state) = 0;
-
-   protected:
-    virtual ~Observer();
   };
 
   class NigoriState {
    public:
     NigoriState() {}
     sync_pb::NigoriSpecifics nigori_specifics;
   };
 
   SyncEncryptionHandler();
   virtual ~SyncEncryptionHandler();
@@ skipping 35 matching lines @@
   // types are encrypted.
   virtual bool IsEncryptEverythingEnabled() const = 0;
 
   // The set of types that are always encrypted.
   static ModelTypeSet SensitiveTypes();
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_ENGINE_SYNC_ENCRYPTION_HANDLER_H_