[Sync] Merge sync_unit_tests into components_unit_tests.

components/sync/sync_tests.gypi

 # Copyright 2013 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.
 
 {
   'targets': [
     # Test support files for the 'sync_core' target.
     # GN version: //components/sync:test_support_sync_core
     {
       'target_name': 'test_support_sync_core',
@@ skipping 224 matching lines @@
         'api/fake_syncable_service.cc',
         'api/fake_syncable_service.h',
         'api/mock_model_type_store.cc',
         'api/mock_model_type_store.h',
         'api/sync_change_processor_wrapper_for_test.cc',
         'api/sync_change_processor_wrapper_for_test.h',
         'api/sync_error_factory_mock.cc',
         'api/sync_error_factory_mock.h',
       ],
     },
-
-    # The unit test executable for sync tests.
-    # GN version: //components/sync:sync_unit_tests
-    {
-      'target_name': 'sync_unit_tests',
-      'type': '<(gtest_target_type)',
-      # Typed-parametrized tests generate exit-time destructors.
-      'variables': { 'enable_wexit_time_destructors': 0, },
-      'defines': [
-        'SYNC_TEST',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:run_all_unittests',
-        '../google_apis/google_apis.gyp:google_apis',
-        '../google_apis/google_apis.gyp:google_apis_test_support',
-        '../net/net.gyp:net',
-        '../net/net.gyp:net_test_support',
-        '../sql/sql.gyp:sql',
-        '../sql/sql.gyp:test_support_sql',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
-        '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        'sync',
-        'test_support_sync_api',
-        'test_support_sync_core',
-        'test_support_sync_core_impl',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'api/attachments/attachment_id_unittest.cc',
-        'api/attachments/attachment_metadata_unittest.cc',
-        'api/attachments/attachment_unittest.cc',
-        'api/entity_data_unittest.cc',
-        'api/model_type_service_unittest.cc',
-        'api/sync_change_unittest.cc',
-        'api/sync_data_unittest.cc',
-        'api/sync_error_unittest.cc',
-        'api/sync_merge_result_unittest.cc',
-        'engine_impl/apply_control_data_updates_unittest.cc',
-        'engine_impl/backoff_delay_provider_unittest.cc',
-        'engine_impl/directory_commit_contribution_unittest.cc',
-        'engine_impl/directory_update_handler_unittest.cc',
-        'engine_impl/get_updates_processor_unittest.cc',
-        'engine_impl/model_type_worker_unittest.cc',
-        'engine_impl/sync_scheduler_unittest.cc',
-        'engine_impl/syncer_proto_util_unittest.cc',
-        'engine_impl/syncer_unittest.cc',
-        'engine_impl/syncer_util_unittest.cc',
-        'engine_impl/worker_entity_tracker_unittest.cc',
-        'core_impl/attachments/attachment_downloader_impl_unittest.cc',
-        'core_impl/attachments/attachment_service_impl_unittest.cc',
-        'core_impl/attachments/attachment_service_proxy_unittest.cc',
-        'core_impl/attachments/attachment_store_frontend_unittest.cc',
-        'core_impl/attachments/attachment_store_test_template.h',
-        'core_impl/attachments/attachment_uploader_impl_unittest.cc',
-        'core_impl/attachments/fake_attachment_downloader_unittest.cc',
-        'core_impl/attachments/fake_attachment_uploader_unittest.cc',
-        'core_impl/attachments/in_memory_attachment_store_unittest.cc',
-        'core_impl/attachments/on_disk_attachment_store_unittest.cc',
-        'core_impl/attachments/task_queue_unittest.cc',
-        'core_impl/debug_info_event_listener_unittest.cc',
-        'core/http_bridge_unittest.cc',
-        'core_impl/js_mutation_event_observer_unittest.cc',
-        'core_impl/js_sync_encryption_handler_observer_unittest.cc',
-        'core_impl/js_sync_manager_observer_unittest.cc',
-        'core_impl/model_type_connector_proxy_unittest.cc',
-        'core/model_type_store_backend_unittest.cc',
-        'core/model_type_store_impl_unittest.cc',
-        'core/processor_entity_tracker_unittest.cc',
-        'core_impl/protocol_event_buffer_unittest.cc',
-        'base/attachment_id_proto_unittest.cc',
-        'base/cancelation_signal_unittest.cc',
-        'base/enum_set_unittest.cc',
-        'base/node_ordinal_unittest.cc',
-        'base/ordinal_unittest.cc',
-        'base/unique_position_unittest.cc',
-        'core/change_record_unittest.cc',
-        'core/data_batch_impl_unittest.cc',
-        'engine/model_safe_worker_unittest.cc',
-        'sessions/sync_session_snapshot_unittest.cc',
-        'core/simple_metadata_change_list_unittest.cc',
-        'base/immutable_unittest.cc',
-        'base/proto_value_ptr_unittest.cc',
-        'base/weak_handle_unittest.cc',
-        'core/shared_model_type_processor_unittest.cc',
-        'core_impl/sync_encryption_handler_impl_unittest.cc',
-        'core_impl/sync_manager_impl_unittest.cc',
-        'core_impl/syncapi_server_connection_manager_unittest.cc',
-        'js/js_event_details_unittest.cc',
-        'js/sync_js_controller_unittest.cc',
-        'protocol/proto_enum_conversions_unittest.cc',
-        'protocol/proto_value_conversions_unittest.cc',
-        'sessions_impl/model_type_registry_unittest.cc',
-        'sessions_impl/nudge_tracker_unittest.cc',
-        'sessions_impl/status_controller_unittest.cc',
-        'syncable/directory_backing_store_unittest.cc',
-        'syncable/directory_unittest.cc',
-        'syncable/directory_unittest.h',
-        'syncable/entry_kernel_unittest.cc',
-        'syncable/model_type_unittest.cc',
-        'syncable/nigori_util_unittest.cc',
-        'syncable/parent_child_index_unittest.cc',
-        'syncable/syncable_enum_conversions_unittest.cc',
-        'syncable/syncable_id_unittest.cc',
-        'syncable/syncable_unittest.cc',
-        'syncable/syncable_util_unittest.cc',
-        'base/cryptographer_unittest.cc',
-        'base/data_type_histogram_unittest.cc',
-        'base/get_session_name_unittest.cc',
-        'base/nigori_unittest.cc',
-        'base/protobuf_unittest.cc',
-      ],
-      'conditions': [
-        ['OS == "android"', {
-          'dependencies': [
-            '../testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-        ['OS=="linux" and chromeos==1', {
-          # Required by get_session_name_unittest.cc on Chrome OS.
-          'dependencies': [
-            '../chromeos/chromeos.gyp:chromeos',
-          ],
-        }],
-        ['OS == "ios"', {
-          'sources!': [
-            'core/http_bridge_unittest.cc',
-          ],
-        }],
-      ],
-    },
   ],
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         # A tool that can be used to launch a python sync server instance.
         {
           'target_name': 'run_sync_testserver',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 97 matching lines @@
             '../base/base.gyp:base',
           ],
           'export_dependent_settings': [
             '../testing/gtest.gyp:gtest',
           ],
           'sources': [
             'test/fake_server/android/fake_server_helper_android.cc',
             'test/fake_server/android/fake_server_helper_android.h',
           ],
         },
-        {
-          # GN: //components/sync:sync_unit_tests_apk
-          'target_name': 'sync_unit_tests_apk',
-          'type': 'none',
-          'dependencies': [
-            'sync_unit_tests',
-          ],
-          'variables': {
-            'test_suite_name': 'sync_unit_tests',
-            'isolate_file': '../sync_unit_tests.isolate',
-          },
-          'includes': [ '../../build/apk_test.gypi' ],
-        },
-      ],
-      'conditions': [
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'sync_unit_tests_apk_run',
-              'type': 'none',
-              'dependencies': [
-                'sync_unit_tests_apk',
-              ],
-              'includes': [
-                '../../build/isolate.gypi',
-              ],
-              'sources': [
-                'sync_unit_tests_apk.isolate',
-              ],
-            },
-          ],
-        }],
-      ],
-    }],
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'sync_unit_tests_run',
-          'type': 'none',
-          'dependencies': [
-            'sync_unit_tests',
-          ],
-          'includes': [
-            '../../build/isolate.gypi',
-          ],
-          'sources': [
-            '../sync_unit_tests.isolate',
-          ],
-        },
       ],
     }],
   ],
 }