Move encryption related files from util folder to encryption folder.

chrome/chrome_tests.gypi

 # 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' : {
     # Variables for js2gtest rules
     'gypv8sh': '../tools/gypv8sh.py',
     'js2gtest': 'test/base/js2gtest.js',
     'js2gtest_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2gtest',
     'mock_js': 'third_party/mock4js/mock4js.js',
@@ skipping 1553 matching lines @@
         'browser/sessions/session_utils_unittest.cc',
         'browser/shell_integration_unittest.cc',
         'browser/speech/speech_input_bubble_controller_unittest.cc',
         'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
         'browser/spellchecker/spellcheck_profile_unittest.cc',
         'browser/status_icons/status_icon_unittest.cc',
         'browser/status_icons/status_tray_unittest.cc',
         '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',
         'browser/sync/glue/autofill_data_type_controller_unittest.cc',
         'browser/sync/glue/bookmark_data_type_controller_unittest.cc',
         'browser/sync/glue/browser_thread_model_worker_unittest.cc',
         'browser/sync/glue/change_processor_mock.cc',
         'browser/sync/glue/change_processor_mock.h',
         'browser/sync/glue/data_type_controller_mock.cc',
         'browser/sync/glue/data_type_controller_mock.h',
@@ skipping 43 matching lines @@
         'browser/sync/signin_manager_unittest.cc',
         'browser/sync/sync_global_error_unittest.cc',
         'browser/sync/sync_prefs_unittest.cc',
         'browser/sync/sync_setup_wizard_unittest.cc',
         'browser/sync/sync_ui_util_mac_unittest.mm',
         'browser/sync/sync_ui_util_unittest.cc',
         'browser/sync/test_profile_sync_service.cc',
         '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',
         'browser/tabs/pinned_tab_codec_unittest.cc',
         'browser/tabs/pinned_tab_service_unittest.cc',
         'browser/tabs/pinned_tab_test_utils.cc',
         'browser/tabs/tab_strip_model_unittest.cc',
         'browser/tabs/tab_strip_selection_model_unittest.cc',
         'browser/task_manager/task_manager_unittest.cc',
         'browser/themes/browser_theme_pack_unittest.cc',
@@ skipping 1500 matching lines @@
       ],
     },
     {
       'target_name': 'sync_unit_tests',
       'type': 'executable',
       'sources': [
         '<(protoc_out_dir)/chrome/browser/sync/protocol/test.pb.cc',
         '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',
         'browser/sync/engine/cleanup_disabled_types_command_unittest.cc',
         'browser/sync/engine/download_updates_command_unittest.cc',
         'browser/sync/engine/mock_model_safe_workers.cc',
         'browser/sync/engine/mock_model_safe_workers.h',
         'browser/sync/engine/model_safe_worker_unittest.cc',
         'browser/sync/engine/nigori_util_unittest.cc',
         'browser/sync/engine/process_commit_response_command_unittest.cc',
@@ skipping 39 matching lines @@
         'browser/sync/test/engine/mock_connection_manager.h',
         'browser/sync/test/engine/mock_gaia_authenticator.cc',
         'browser/sync/test/engine/mock_gaia_authenticator.h',
         'browser/sync/test/engine/mock_gaia_authenticator_unittest.cc',
         'browser/sync/test/engine/syncer_command_test.cc',
         'browser/sync/test/engine/syncer_command_test.h',
         'browser/sync/test/engine/test_id_factory.h',
         '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',
         'browser/sync/util/user_settings_unittest.cc',
         'browser/sync/util/weak_handle_unittest.cc',
       ],
       'include_dirs': [
         '..',
         '<(protoc_out_dir)',
       ],
@@ skipping 996 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }