Move encryption related files from util folder to encryption folder.

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 40c7ed7219785da671cecd5b4c9e2f611d0c4ab9..4e915ef908be20917d68a2681047f1ade1d8b323 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -356,6 +356,12 @@
       'target_name': 'sync',
       'type': 'static_library',
       'sources': [
+        'browser/sync/encryption/cryptographer.cc',
+        'browser/sync/encryption/cryptographer.h',
+        'browser/sync/encryption/nigori.cc',
+        'browser/sync/encryption/nigori.h',
+        'browser/sync/encryption/nigori_util.cc',
+        'browser/sync/encryption/nigori_util.h',
         'browser/sync/engine/all_status.cc',
         'browser/sync/engine/all_status.h',
         'browser/sync/engine/apply_updates_command.cc',
@@ -382,8 +388,6 @@
         'browser/sync/engine/net/server_connection_manager.h',
         'browser/sync/engine/net/url_translator.cc',
         'browser/sync/engine/net/url_translator.h',
-        'browser/sync/engine/nigori_util.cc',
-        'browser/sync/engine/nigori_util.h',
         'browser/sync/engine/nudge_source.cc',
         'browser/sync/engine/nudge_source.h',
         'browser/sync/engine/polling_constants.cc',
@@ -471,16 +475,12 @@
         'browser/sync/syncable/syncable_enum_conversions.cc',
         'browser/sync/syncable/syncable_enum_conversions.h',
         'browser/sync/syncable/transaction_observer.h',
-        'browser/sync/util/cryptographer.cc',
-        'browser/sync/util/cryptographer.h',
         'browser/sync/util/dbgq.h',
         'browser/sync/util/extensions_activity_monitor.cc',
         'browser/sync/util/extensions_activity_monitor.h',
         'browser/sync/util/immutable.h',
         'browser/sync/util/logging.cc',
         'browser/sync/util/logging.h',
-        'browser/sync/util/nigori.cc',
-        'browser/sync/util/nigori.h',
         'browser/sync/util/oauth.cc',
         'browser/sync/util/oauth.h',
         'browser/sync/util/sqlite_utils.cc',
@@ -522,8 +522,8 @@
       'conditions': [
         ['OS=="win"', {
           'sources' : [
-            'browser/sync/util/data_encryption.cc',
-            'browser/sync/util/data_encryption.h',
+            'browser/sync/encryption/data_encryption.cc',
+            'browser/sync/encryption/data_encryption.h',
           ],
         }],
         ['toolkit_uses_gtk == 1', {