Revert of [Sync] Merge sync_unit_tests into components_unit_tests, take 2.

components/components_tests.gyp

 # Copyright 2014 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': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 814 matching lines @@
     ],
     'suggestions_unittest_sources': [
       'suggestions/blacklist_store_unittest.cc',
       'suggestions/image_manager_unittest.cc',
       'suggestions/suggestions_service_unittest.cc',
       'suggestions/suggestions_store_unittest.cc',
     ],
     'supervised_user_error_page_unittest_sources': [
       'supervised_user_error_page/supervised_user_error_page_unittest.cc',
     ],
-    'sync_unittest_sources': [
-      'sync/api/attachments/attachment_id_unittest.cc',
-      'sync/api/attachments/attachment_metadata_unittest.cc',
-      'sync/api/attachments/attachment_unittest.cc',
-      'sync/api/entity_data_unittest.cc',
-      'sync/api/model_type_service_unittest.cc',
-      'sync/api/sync_change_unittest.cc',
-      'sync/api/sync_data_unittest.cc',
-      'sync/api/sync_error_unittest.cc',
-      'sync/api/sync_merge_result_unittest.cc',
-      'sync/engine_impl/apply_control_data_updates_unittest.cc',
-      'sync/engine_impl/backoff_delay_provider_unittest.cc',
-      'sync/engine_impl/directory_commit_contribution_unittest.cc',
-      'sync/engine_impl/directory_update_handler_unittest.cc',
-      'sync/engine_impl/get_updates_processor_unittest.cc',
-      'sync/engine_impl/model_type_worker_unittest.cc',
-      'sync/engine_impl/sync_scheduler_unittest.cc',
-      'sync/engine_impl/syncer_proto_util_unittest.cc',
-      'sync/engine_impl/syncer_unittest.cc',
-      'sync/engine_impl/syncer_util_unittest.cc',
-      'sync/engine_impl/worker_entity_tracker_unittest.cc',
-      'sync/core_impl/attachments/attachment_downloader_impl_unittest.cc',
-      'sync/core_impl/attachments/attachment_service_impl_unittest.cc',
-      'sync/core_impl/attachments/attachment_service_proxy_unittest.cc',
-      'sync/core_impl/attachments/attachment_store_frontend_unittest.cc',
-      'sync/core_impl/attachments/attachment_store_test_template.h',
-      'sync/core_impl/attachments/attachment_uploader_impl_unittest.cc',
-      'sync/core_impl/attachments/fake_attachment_downloader_unittest.cc',
-      'sync/core_impl/attachments/fake_attachment_uploader_unittest.cc',
-      'sync/core_impl/attachments/in_memory_attachment_store_unittest.cc',
-      'sync/core_impl/attachments/on_disk_attachment_store_unittest.cc',
-      'sync/core_impl/attachments/task_queue_unittest.cc',
-      'sync/core_impl/debug_info_event_listener_unittest.cc',
-      'sync/core/http_bridge_unittest.cc',
-      'sync/core_impl/js_mutation_event_observer_unittest.cc',
-      'sync/core_impl/js_sync_encryption_handler_observer_unittest.cc',
-      'sync/core_impl/js_sync_manager_observer_unittest.cc',
-      'sync/core_impl/model_type_connector_proxy_unittest.cc',
-      'sync/core/model_type_store_backend_unittest.cc',
-      'sync/core/model_type_store_impl_unittest.cc',
-      'sync/core/processor_entity_tracker_unittest.cc',
-      'sync/core_impl/protocol_event_buffer_unittest.cc',
-      'sync/base/attachment_id_proto_unittest.cc',
-      'sync/base/cancelation_signal_unittest.cc',
-      'sync/base/enum_set_unittest.cc',
-      'sync/base/node_ordinal_unittest.cc',
-      'sync/base/ordinal_unittest.cc',
-      'sync/base/unique_position_unittest.cc',
-      'sync/core/change_record_unittest.cc',
-      'sync/core/data_batch_impl_unittest.cc',
-      'sync/engine/model_safe_worker_unittest.cc',
-      'sync/sessions/sync_session_snapshot_unittest.cc',
-      'sync/core/simple_metadata_change_list_unittest.cc',
-      'sync/base/immutable_unittest.cc',
-      'sync/base/proto_value_ptr_unittest.cc',
-      'sync/base/weak_handle_unittest.cc',
-      'sync/core/shared_model_type_processor_unittest.cc',
-      'sync/core_impl/sync_encryption_handler_impl_unittest.cc',
-      'sync/core_impl/sync_manager_impl_unittest.cc',
-      'sync/core_impl/syncapi_server_connection_manager_unittest.cc',
-      'sync/js/js_event_details_unittest.cc',
-      'sync/js/sync_js_controller_unittest.cc',
-      'sync/protocol/proto_enum_conversions_unittest.cc',
-      'sync/protocol/proto_value_conversions_unittest.cc',
-      'sync/sessions_impl/model_type_registry_unittest.cc',
-      'sync/sessions_impl/nudge_tracker_unittest.cc',
-      'sync/sessions_impl/status_controller_unittest.cc',
-      'sync/syncable/directory_backing_store_unittest.cc',
-      'sync/syncable/directory_unittest.cc',
-      'sync/syncable/directory_unittest.h',
-      'sync/syncable/entry_kernel_unittest.cc',
-      'sync/syncable/model_type_unittest.cc',
-      'sync/syncable/nigori_util_unittest.cc',
-      'sync/syncable/parent_child_index_unittest.cc',
-      'sync/syncable/syncable_enum_conversions_unittest.cc',
-      'sync/syncable/syncable_id_unittest.cc',
-      'sync/syncable/syncable_unittest.cc',
-      'sync/syncable/syncable_util_unittest.cc',
-      'sync/base/cryptographer_unittest.cc',
-      'sync/base/data_type_histogram_unittest.cc',
-      'sync/base/get_session_name_unittest.cc',
-      'sync/base/nigori_unittest.cc',
-      'sync/base/protobuf_unittest.cc',
-    ],
     'sync_bookmarks_unittest_sources': [
       'sync_bookmarks/bookmark_data_type_controller_unittest.cc',
     ],
     'sync_driver_unittest_sources': [
       'sync_driver/about_sync_util_unittest.cc',
       'sync_driver/backend_migrator_unittest.cc',
       'sync_driver/data_type_manager_impl_unittest.cc',
       'sync_driver/device_count_metrics_provider_unittest.cc',
       'sync_driver/device_info_data_type_controller_unittest.cc',
       'sync_driver/device_info_service_unittest.cc',
@@ skipping 250 matching lines @@
         '<@(search_unittest_sources)',
         '<@(security_state_unittest_sources)',
         '<@(sessions_unittest_sources)',
         '<@(signin_unittest_sources)',
         '<@(ssl_config_unittest_sources)',
         '<@(ssl_errors_unittest_sources)',
         '<@(subresource_filter_core_browser_unittest_sources)',
         '<@(subresource_filter_core_common_unittest_sources)',
         '<@(suggestions_unittest_sources)',
         '<@(supervised_user_error_page_unittest_sources)',
-        '<@(sync_unittest_sources)',
         '<@(sync_bookmarks_unittest_sources)',
         '<@(sync_driver_unittest_sources)',
         '<@(sync_sessions_unittest_sources)',
         '<@(syncable_prefs_unittest_sources)',
         '<@(translate_unittest_sources)',
         '<@(undo_unittest_sources)',
         '<@(update_client_unittest_sources)',
         '<@(upload_list_unittest_sources)',
         '<@(url_formatter_unittest_sources)',
         '<@(url_matcher_unittest_sources)',
         '<@(user_prefs_unittest_sources)',
         '<@(variations_unittest_sources)',
         '<@(web_resource_unittest_sources)',
         '<@(webdata_unittest_sources)',
         'net_log/net_log_file_writer_unittest.cc',
       ],
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../google_apis/google_apis.gyp:google_apis_test_support',
         '../jingle/jingle.gyp:notifier_test_util',
         '../net/net.gyp:net_test_support',
         '../sql/sql.gyp:test_support_sql',
+        '../components/sync.gyp:sync',
+        '../components/sync.gyp:test_support_sync_api',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/re2/re2.gyp:re2',
         '../ui/base/ui_base.gyp:ui_base',
@@ skipping 126 matching lines @@
         'components.gyp:webdata_services_test_support',
         'components.gyp:web_resource',
         'components.gyp:web_resource_test_support',
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
         'components_tests_pak',
         'link_header_util/link_header_util.gyp:link_header_util',
         'mime_util/mime_util.gyp:mime_util',
         'prefs/prefs.gyp:prefs',
         'prefs/prefs.gyp:prefs_test_support',
-        'sync.gyp:sync',
-        'sync.gyp:test_support_sync_api',
-        'sync.gyp:test_support_sync_core',
-        'sync.gyp:test_support_sync_core_impl',
         'url_formatter/url_formatter.gyp:url_formatter',
       ],
       'conditions': [
         ['OS!="mac" and OS!="ios"', {
           'sources!': [
             'crash/core/common/objc_zombie_unittest.mm',
           ],
         }],
         ['enable_rlz_support==1', {
           'sources': [
@@ skipping 147 matching lines @@
                 'display_compositor/buffer_queue_unittest.cc',
               ],
             }],
           ],
         }, { # 'OS == "ios"'
           'sources/': [
             # Exclude all tests that depends on //content (based on layered-
             # component directory structure).
             ['exclude', '^[^/]*/content/'],
           ],
-          'sources!': [
-            'core/http_bridge_unittest.cc',
-          ],
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/ui_test.pak',
           ],
           'dependencies': [
             '../ios/web/ios_web.gyp:ios_web_test_support',
             '../third_party/ocmock/ocmock.gyp:ocmock',
             'components.gyp:autofill_ios_browser',
             'components.gyp:sessions_ios',
             'components.gyp:signin_ios_browser',
             'components.gyp:signin_ios_browser_test_support',
@@ skipping 595 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }