Move encryption related files from util folder to encryption folder.

chrome/browser/sync/encryption/cryptographer.h

 // 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.
 
-#ifndef CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
-#define CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
+#ifndef CHROME_BROWSER_SYNC_ENCRYPTION_CRYPTOGRAPHER_H_
+#define CHROME_BROWSER_SYNC_ENCRYPTION_CRYPTOGRAPHER_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/syncable/model_type.h"
-#include "chrome/browser/sync/util/nigori.h"
+#include "chrome/browser/sync/encryption/nigori.h"

[Nicolas Zea, 2011/11/17 21:04:30]

This #include and others in the patch are not in alphabetical order.

 
 namespace browser_sync {
 
 extern const char kNigoriTag[];
 
 // The parameters used to initialize a Nigori instance.
 struct KeyParams {
   std::string hostname;
   std::string username;
   std::string password;
@@ skipping 188 matching lines @@
   scoped_ptr<sync_pb::EncryptedData> pending_keys_;
 
   syncable::ModelTypeSet encrypted_types_;
   bool encrypt_everything_;
 
   DISALLOW_COPY_AND_ASSIGN(Cryptographer);
 };
 
 }  // namespace browser_sync
 
-#endif  // CHROME_BROWSER_SYNC_UTIL_CRYPTOGRAPHER_H_
+#endif  // CHROME_BROWSER_SYNC_ENCRYPTION_CRYPTOGRAPHER_H_