[Sync] Refactor GetEncryptedTypes usage.

sync/engine/conflict_resolver.cc

Index: sync/engine/conflict_resolver.cc
diff --git a/sync/engine/conflict_resolver.cc b/sync/engine/conflict_resolver.cc
index 5912e466c0abbfaaf0c183f6b1cdc6a2bddbc077..736e6682b213887cf717b1c5ecfeb346b1483fdc 100644
--- a/sync/engine/conflict_resolver.cc
+++ b/sync/engine/conflict_resolver.cc
@@ -17,6 +17,7 @@
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
+#include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/util/cryptographer.h"
 
@@ -229,7 +230,9 @@ ConflictResolver::ProcessSimpleConflict(WriteTransaction* trans,
       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, trans);
+      trans->directory()->GetNigoriHandler()->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