Move encryption related files from util folder to encryption folder.

chrome/browser/sync/util/user_settings.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.
 //
 // This class isn't pretty. It's just a step better than globals, which is what
 // these were previously.
 
 #include "chrome/browser/sync/util/user_settings.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"  // For migration.
-#include "chrome/browser/sync/util/data_encryption.h"
+#include "chrome/browser/sync/encryption/data_encryption.h"
 #include "chrome/browser/sync/util/sqlite_utils.h"
 #include "chrome/common/random.h"
 
 using std::numeric_limits;
 using std::string;
 using std::vector;
 
 using syncable::DirectoryManager;
 
 namespace browser_sync {
@@ skipping 420 matching lines @@
   query.prepare(dbhandle.get(), "SELECT email FROM cookies");
   if (SQLITE_ROW == query.step()) {
     *username = query.column_string(0);
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace browser_sync