Move encryption related files from util folder to encryption folder.

chrome/browser/sync/engine/syncer_util.cc

Index: chrome/browser/sync/engine/syncer_util.cc
diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc
index 8b8e5eff80bb41bf5fe99f6fe5bc01ec9de7d5d2..e2b9eaee760b05f1430405f97fc30f02755b0e58 100644
--- a/chrome/browser/sync/engine/syncer_util.cc
+++ b/chrome/browser/sync/engine/syncer_util.cc
@@ -11,7 +11,7 @@
 
 #include "base/location.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
-#include "chrome/browser/sync/engine/nigori_util.h"
+#include "chrome/browser/sync/encryption/nigori_util.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
@@ -301,10 +301,11 @@ UpdateAttemptResponse SyncerUtil::AttemptToUpdateEntry(
     // Make sure any unsynced changes are properly encrypted as necessary.
     syncable::ModelTypeSet encrypted_types =
         cryptographer->GetEncryptedTypes();
-    if (!VerifyUnsyncedChangesAreEncrypted(trans, encrypted_types) &&
+    if (!browser_sync::encryption::VerifyUnsyncedChangesAreEncrypted(
+         trans, encrypted_types) &&
         (!cryptographer->is_ready() ||
-         !syncable::ProcessUnsyncedChangesForEncryption(trans,
-                                                        cryptographer))) {
+         !browser_sync::encryption::ProcessUnsyncedChangesForEncryption(trans,
+             cryptographer))) {
       // We were unable to encrypt the changes, possibly due to a missing
       // passphrase. We return conflict, even though the conflict is with the
       // unsynced change and not the nigori node. We ensure foward progress