Move encryption related files from util folder to encryption folder.

chrome/browser/sync/engine/get_commit_ids_command.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/engine/get_commit_ids_command.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
-#include "chrome/browser/sync/engine/nigori_util.h"
+#include "chrome/browser/sync/encryption/nigori_util.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
-#include "chrome/browser/sync/util/cryptographer.h"
+#include "chrome/browser/sync/encryption/cryptographer.h"
 
 using std::set;
 using std::vector;
 
 namespace browser_sync {
 
 using sessions::OrderedCommitSet;
 using sessions::SyncSession;
 using sessions::StatusController;
 
@@ skipping 56 matching lines @@
     // conflict, so there's no point in attempting to commit.
     DCHECK(entry.Get(syncable::IS_UNAPPLIED_UPDATE));  // In conflict.
     // TODO(zea): switch this to DVLOG once it's clear bug 100660 is fixed.
     VLOG(1) << "Excluding entry from commit due to version mismatch "
             << entry;
     return false;
   }
 
   if (encrypted_types.count(entry.GetModelType()) > 0 &&
       (passphrase_missing ||
-       syncable::EntryNeedsEncryption(encrypted_types, entry))) {
+      browser_sync::encryption::EntryNeedsEncryption(encrypted_types, entry))) {
     // This entry requires encryption but is not properly encrypted (possibly
     // due to the cryptographer not being initialized or the user hasn't
     // provided the most recent passphrase).
     // TODO(zea): switch this to DVLOG once it's clear bug 100660 is fixed.
     VLOG(1) << "Excluding entry from commit due to lack of encryption "
             << entry;
     return false;
   }
 
   return true;
@@ skipping 222 matching lines @@
   // delete trees.
 
   // Add moves and creates, and prepend their uncommitted parents.
   AddCreatesAndMoves(unsynced_handles, write_transaction, routes);
 
   // Add all deletes.
   AddDeletes(unsynced_handles, write_transaction);
 }
 
 }  // namespace browser_sync