Move encryption related files from util folder to encryption folder.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0f5530300997c9e339d8e08848940c8b301851f2..179a006765f3d08f475a284ee63612a0a42e7bc6 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1571,6 +1571,8 @@
         'browser/sync/abstract_profile_sync_service_test.cc',
         'browser/sync/abstract_profile_sync_service_test.h',
         'browser/sync/backend_migrator_unittest.cc',
+        'browser/sync/encryption/cryptographer_unittest.cc',
+        'browser/sync/encryption/nigori_unittest.cc',
         'browser/sync/internal_api/read_node_mock.cc',
         'browser/sync/internal_api/read_node_mock.h',
         'browser/sync/glue/app_notification_data_type_controller_unittest.cc',
@@ -1634,8 +1636,6 @@
         'browser/sync/test_profile_sync_service.h',
         'browser/sync/test/test_http_bridge_factory.cc',
         'browser/sync/test/test_http_bridge_factory.h',
-        'browser/sync/util/cryptographer_unittest.cc',
-        'browser/sync/util/nigori_unittest.cc',
         'browser/tab_contents/render_view_context_menu_unittest.cc',
         'browser/tab_contents/thumbnail_generator_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
@@ -3156,6 +3156,7 @@
         'app/breakpad_mac_stubs.mm',
         'browser/sync/api/sync_change_unittest.cc',
         'browser/sync/api/sync_error_unittest.cc',
+        'browser/sync/encryption/data_encryption_unittest.cc',
         'browser/sync/engine/apply_updates_command_unittest.cc',
         'browser/sync/engine/build_commit_command_unittest.cc',
         'browser/sync/engine/clear_data_command_unittest.cc',
@@ -3215,7 +3216,6 @@
         'browser/sync/test/engine/test_syncable_utils.cc',
         'browser/sync/test/engine/test_syncable_utils.h',
         'browser/sync/test/sessions/test_scoped_session_event_listener.h',
-        'browser/sync/util/data_encryption_unittest.cc',
         'browser/sync/util/extensions_activity_monitor_unittest.cc',
         'browser/sync/util/protobuf_unittest.cc',
         'browser/sync/util/immutable_unittest.cc',