sync: Finish non-blocking type encryption support

sync/util/cryptographer.h

Index: sync/util/cryptographer.h
diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h
index 9876f83b7680522c564215928f52f05621031b17..530995cb05d7067be10557e1ca50ab6a312b3535 100644
--- a/sync/util/cryptographer.h
+++ b/sync/util/cryptographer.h
@@ -51,6 +51,7 @@ 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
@@ -206,13 +207,14 @@ class SYNC_EXPORT Cryptographer {
 
   // 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