[Sync] Add SyncEncryptionHandler

sync/engine/conflict_resolver.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/conflict_resolver.h"
 
 #include <algorithm>
 #include <list>
 #include <map>
 #include <set>
@@ skipping 211 matching lines @@
 
     // We manually merge nigori data.
     if (entry.GetModelType() == NIGORI) {
       // Create a new set of specifics based on the server specifics (which
       // preserves their encryption keys).
       sync_pb::EntitySpecifics specifics =
           entry.Get(syncable::SERVER_SPECIFICS);
       sync_pb::NigoriSpecifics* server_nigori = specifics.mutable_nigori();
       // Store the merged set of encrypted types (cryptographer->Update(..) will
       // have merged the local types already).
-      cryptographer->UpdateNigoriFromEncryptedTypes(server_nigori);
+      cryptographer->UpdateNigoriFromEncryptedTypes(server_nigori, trans);
       // The cryptographer has the both the local and remote encryption keys
       // (added at cryptographer->Update(..) time).
       // If the cryptographer is ready, then it already merged both sets of keys
       // and we can store them back in. In that case, the remote key was already
       // part of the local keybag, so we preserve the local key as the default
       // (including whether it's an explicit key).
       // If the cryptographer is not ready, then the user will have to provide
       // the passphrase to decrypt the pending keys. When they do so, the
       // SetDecryptionPassphrase code will act based on whether the server
       // update has an explicit passphrase or not.
@@ skipping 166 matching lines @@
           forward_progress = true;
           break;
       }
       processed_items.insert(id);
     }
   }
   return forward_progress;
 }
 
 }  // namespace syncer