Move encryption related files from util folder to encryption folder.

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 338 matching lines @@
       ],
       # Even though this target depends on sync_proto, it doesn't
       # need to export a hard dependency since we explicitly avoid
       # including the generated proto header files from this target's
       # header files.
     },
     {
       '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',
         'browser/sync/engine/apply_updates_command.h',
         'browser/sync/engine/build_and_process_conflict_sets_command.cc',
         'browser/sync/engine/build_and_process_conflict_sets_command.h',
         'browser/sync/engine/build_commit_command.cc',
         'browser/sync/engine/build_commit_command.h',
         'browser/sync/engine/cleanup_disabled_types_command.cc',
         'browser/sync/engine/cleanup_disabled_types_command.h',
         'browser/sync/engine/clear_data_command.cc',
         'browser/sync/engine/clear_data_command.h',
         'browser/sync/engine/conflict_resolver.cc',
         'browser/sync/engine/conflict_resolver.h',
         'browser/sync/engine/download_updates_command.cc',
         'browser/sync/engine/download_updates_command.h',
         'browser/sync/engine/get_commit_ids_command.cc',
         'browser/sync/engine/get_commit_ids_command.h',
         'browser/sync/engine/model_changing_syncer_command.cc',
         'browser/sync/engine/model_changing_syncer_command.h',
         'browser/sync/engine/model_safe_worker.cc',
         'browser/sync/engine/model_safe_worker.h',
         'browser/sync/engine/net/server_connection_manager.cc',
         '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',
         'browser/sync/engine/polling_constants.h',
         'browser/sync/engine/post_commit_message_command.cc',
         'browser/sync/engine/post_commit_message_command.h',
         'browser/sync/engine/process_commit_response_command.cc',
         'browser/sync/engine/process_commit_response_command.h',
         'browser/sync/engine/process_updates_command.cc',
         'browser/sync/engine/process_updates_command.h',
@@ skipping 67 matching lines @@
         'browser/sync/syncable/syncable-inl.h',
         'browser/sync/syncable/syncable.cc',
         'browser/sync/syncable/syncable.h',
         'browser/sync/syncable/syncable_changes_version.h',
         'browser/sync/syncable/syncable_columns.h',
         'browser/sync/syncable/syncable_id.cc',
         'browser/sync/syncable/syncable_id.h',
         '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',
         'browser/sync/util/sqlite_utils.h',
         'browser/sync/util/time.cc',
         'browser/sync/util/time.h',
         'browser/sync/util/unrecoverable_error_info.h',
         'browser/sync/util/unrecoverable_error_info.cc',
         'browser/sync/util/user_settings.cc',
         'browser/sync/util/user_settings.h',
@@ skipping 21 matching lines @@
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         'browser/sync/protocol/sync_proto.gyp:sync_proto',
       ],
       # This target exports a hard dependency because its header files include
       # protobuf header files from sync_proto.
       'hard_dependency': 1,
       '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', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'link_settings': {
             'libraries': [
               '-lXss',
             ],
@@ skipping 765 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }