[Sync] Add SyncEncryptionHandler

sync/engine/syncer_util.cc

 // Copyright (c) 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.
 
 #include "sync/engine/syncer_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 199 matching lines @@
   // preserve the encryption keys based on the local passphrase, while the
   // nigori node will preserve the server encryption keys.
   //
   // If non-encryption changes are made to the nigori node, they will be
   // lost as part of conflict resolution. This is intended, as we place a higher
   // priority on preserving the server's passphrase change to preserving local
   // non-encryption changes. Next time the non-encryption changes are made to
   // the nigori node (e.g. on restart), they will commit without issue.
   if (specifics.has_nigori()) {
     const sync_pb::NigoriSpecifics& nigori = specifics.nigori();
-    cryptographer->Update(nigori);
+    cryptographer->ApplyNigoriUpdate(nigori, trans);
 
     // Make sure any unsynced changes are properly encrypted as necessary.
     // We only perform this if the cryptographer is ready. If not, these are
     // re-encrypted at SetDecryptionPassphrase time (via ReEncryptEverything).
     // This logic covers the case where the nigori update marked new datatypes
     // for encryption, but didn't change the passphrase.
     if (cryptographer->is_ready()) {
       // Note that we don't bother to encrypt any data for which IS_UNSYNCED
       // == false here. The machine that turned on encryption should know about
       // and re-encrypt all synced data. It's possible it could get interrupted
@@ skipping 461 matching lines @@
   if (update.version() < target->Get(SERVER_VERSION)) {
     LOG(WARNING) << "Update older than current server version for "
                  << *target << " Update:"
                  << SyncerProtoUtil::SyncEntityDebugString(update);
     return VERIFY_SUCCESS;  // Expected in new sync protocol.
   }
   return VERIFY_UNDECIDED;
 }
 
 }  // namespace syncer