sync: Finish non-blocking type encryption support

sync/util/cryptographer.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 SYNC_UTIL_CRYPTOGRAPHER_H_
 #define SYNC_UTIL_CRYPTOGRAPHER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 33 matching lines @@
 // should be prompted for the new passphrase and DecryptPendingKeys be called.
 //
 // Whenever a update to an encrypted node is received from the server,
 // CanDecrypt should be used to verify whether the Cryptographer can decrypt
 // that node. If it cannot, then the application of that update should be
 // delayed until after it can be decrypted.
 class SYNC_EXPORT Cryptographer {
  public:
   // Does not take ownership of |encryptor|.
   explicit Cryptographer(Encryptor* encryptor);
+  explicit Cryptographer(const Cryptographer& other);
   ~Cryptographer();
 
   // |restored_bootstrap_token| can be provided via this method to bootstrap
   // Cryptographer instance into the ready state (is_ready will be true).
   // It must be a string that was previously built by the
   // GetSerializedBootstrapToken function.  It is possible that the token is no
   // longer valid (due to server key change), in which case the normal
   // decryption code paths will fail and the user will need to provide a new
   // passphrase.
   // It is an error to call this if is_ready() == true, though it is fair to
@@ skipping 135 matching lines @@
   // default as well.
   bool AddKeyImpl(scoped_ptr<Nigori> nigori, bool set_as_default);
 
   // Helper to unencrypt a bootstrap token into a serialized sync_pb::NigoriKey.
   std::string UnpackBootstrapToken(const std::string& token) const;
 
   Encryptor* const encryptor_;
 
   // The Nigoris we know about, mapped by key name.
   NigoriMap nigoris_;
+
   // The key name associated with the default nigori. If non-empty, must
   // correspond to a nigori within |nigoris_|.
   std::string default_nigori_name_;
 
   scoped_ptr<sync_pb::EncryptedData> pending_keys_;
 
-  DISALLOW_COPY_AND_ASSIGN(Cryptographer);
+  DISALLOW_ASSIGN(Cryptographer);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_UTIL_CRYPTOGRAPHER_H_