Move encryption related files from util folder to encryption folder.

chrome/browser/sync/engine/syncer_util.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/syncer_util.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
 #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"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/syncable.h"
@@ skipping 269 matching lines @@
   // ChangeProcessor.
   const sync_pb::EntitySpecifics& specifics = entry->Get(SERVER_SPECIFICS);
   if (specifics.HasExtension(sync_pb::nigori)) {
     const sync_pb::NigoriSpecifics& nigori =
         specifics.GetExtension(sync_pb::nigori);
     cryptographer->Update(nigori);
 
     // 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
       // because the cryptographer already has the pending keys set, so once
       // the new passphrase is entered we should be able to encrypt properly.
       // And, because this update will not be applied yet, next time around
       // we will properly encrypt all appropriate unsynced data.
       // Note: we return CONFLICT_ENCRYPTION instead of CONFLICT. See
       // explanation below.
       VLOG(1) << "Marking nigori node update as conflicting due to being unable"
@@ skipping 508 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 browser_sync