[Sync] Merge sync_unit_tests into components_unit_tests.

BUG=626114

Review-Url: https://codereview.chromium.org/2186733002
Cr-Commit-Position: refs/heads/master@{#409060}

BUILD.gn

@@ -130,7 +130,6 @@ if (is_win) {
       "//base:base_unittests",
       "//chrome/test:browser_tests",
       "//chrome/test:sync_integration_tests",
-      "//components/sync:sync_unit_tests",
       "//ipc:ipc_tests",
       "//media:media_unittests",
       "//media/midi:midi_unittests",
@@ -185,7 +184,6 @@ group("both_gn_and_gyp") {
     "//base:base_unittests",
     "//chrome/installer",
     "//components:components_unittests",
-    "//components/sync:sync_unit_tests",
     "//net:net_unittests",
     "//skia:skia_unittests",
     "//sql:sql_unittests",

build/all.gyp

@@ -310,7 +310,6 @@
         '../net/net.gyp:net_unittests',
         '../skia/skia_tests.gyp:skia_unittests',
         '../sql/sql.gyp:sql_unittests',
-        '../components/sync.gyp:sync_unit_tests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../ui/display/display.gyp:display_unittests',
         '../ui/gfx/gfx_tests.gyp:gfx_unittests',
@@ -795,7 +794,6 @@
             '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
             '../skia/skia_tests.gyp:skia_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../testing/android/junit/junit_test.gyp:junit_unit_tests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/WebKit/public/all.gyp:*',
@@ -826,7 +824,6 @@
             '../net/net.gyp:net_unittests_apk',
             '../skia/skia_tests.gyp:skia_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
-            '../components/sync.gyp:sync_unit_tests_apk',
             '../ui/android/ui_android.gyp:ui_android_unittests_apk',
             '../ui/android/ui_android.gyp:ui_junit_tests',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
@@ -910,7 +907,6 @@
             '../rlz/rlz.gyp:*',
             '../skia/skia_tests.gyp:skia_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
@@ -949,7 +945,6 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../skia/skia_tests.gyp:skia_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
@@ -1021,7 +1016,6 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../skia/skia_tests.gyp:skia_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
@@ -1113,7 +1107,6 @@
             '../remoting/remoting.gyp:remoting_unittests',
             '../skia/skia_tests.gyp:skia_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
@@ -1169,7 +1162,6 @@
             '../net/net.gyp:net_unittests',
             '../printing/printing.gyp:printing_unittests',
             '../sql/sql.gyp:sql_unittests',
-            '../components/sync.gyp:sync_unit_tests',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../ui/gl/gl_tests.gyp:gl_unittests',
@@ -1250,7 +1242,6 @@
                 '../base/base.gyp:base_unittests',
                 '../ipc/ipc.gyp:ipc_tests',
                 '../sql/sql.gyp:sql_unittests',
-                '../components/sync.gyp:sync_unit_tests',
               ],
             }],
             ['chromeos==1', {

build/android/pylib/gtest/gtest_config.py

@@ -37,7 +37,6 @@
     'sandbox_linux_unittests',
     'skia_unittests',
     'sql_unittests',
-    'sync_unit_tests',
     'ui_android_unittests',
     'ui_base_unittests',
     'ui_touch_selection_unittests',

build/android/pylib/gtest/gtest_test_instance.py

@@ -42,7 +42,6 @@
     'midi_unittests': 'media/midi/midi_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
     'sql_unittests': 'sql/sql_unittests.isolate',
-    'sync_unit_tests': 'components/sync/sync_unit_tests.isolate',
     'ui_base_unittests': 'ui/base/ui_base_tests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
     'webkit_unit_tests':

build/gn_migration.gypi

@@ -71,7 +71,6 @@
         '../printing/printing.gyp:printing_unittests',
         '../skia/skia_tests.gyp:skia_unittests',
         '../sql/sql.gyp:sql_unittests',
-        '../components/sync.gyp:sync_unit_tests',
         '../testing/gmock.gyp:gmock_main',
         '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests',
         '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests',
@@ -220,7 +219,6 @@
             '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
             '../skia/skia_tests.gyp:skia_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
-            '../components/sync.gyp:sync_unit_tests_apk',
             '../testing/android/junit/junit_test.gyp:junit_unit_tests',
             '../third_party/smhasher/smhasher.gyp:murmurhash3',
             '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_apk',
@@ -573,7 +571,6 @@
             '../remoting/remoting.gyp:remoting_unittests_run',
             '../skia/skia_tests.gyp:skia_unittests_run',
             '../sql/sql.gyp:sql_unittests_run',
-            '../components/sync.gyp:sync_unit_tests_run',
             '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_heap_unittests_run',
             '../third_party/WebKit/Source/platform/blink_platform_tests.gyp:blink_platform_unittests_run',
             '../third_party/WebKit/Source/web/web_tests.gyp:webkit_unit_tests_run',

chrome/tools/build/win/FILES.cfg

@@ -521,11 +521,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
   },
-  {
-    'filename': 'sync_unit_tests.exe',
-    'buildtype': ['official'],
-    'optional': ['official'],
-  },
   # Installer files (official build only):
   {
     'filename': 'setup.exe',

chromecast/BUILD.gn

@@ -40,7 +40,6 @@ cast_test_group("cast_tests") {
     "//ppapi:ppapi_unittests",
     "//sandbox/linux:sandbox_linux_unittests",
     "//sql:sql_unittests",
-    "//components/sync:sync_unit_tests",
     "//third_party/cacheinvalidation:cacheinvalidation_unittests",
     "//ui/base:ui_base_unittests",
   ]
@@ -85,7 +84,6 @@ cast_test_group("cast_tests") {
       #   SoundsManagerTest.Play
       # Disable AudioStreamHandlerTest.ConsecutivePlayRequests (b/16539293)
       "media_unittests --gtest_filter=-AudioOutputControllerTest.PlayDivertSwitchDeviceRevertClose:AudioOutputControllerTest.PlaySwitchDeviceClose:AudioStreamHandlerTest.Play:AudioStreamHandlerTest.ConsecutivePlayRequests:PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VideoOnly_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP9*:PipelineIntegrationTest.P444_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP8A*:OpusAudioDecoderTest/AudioDecoderTest.ProduceAudioSamples/0:SoundsManagerTest.Play",
-      "sync_unit_tests --gtest_filter=-SyncHttpBridgeTest.*",
 
       # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds
       "url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid",

chromecast/chromecast_tests.gypi

@@ -110,7 +110,6 @@
         '../ppapi/ppapi_internal.gyp:ppapi_unittests',
         '../sandbox/sandbox.gyp:sandbox_linux_unittests',
         '../sql/sql.gyp:sql_unittests',
-        '../components/sync.gyp:sync_unit_tests',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../url/url.gyp:url_unittests',
@@ -153,7 +152,6 @@
               #   SoundsManagerTest.Play
               # Disable AudioStreamHandlerTest.ConsecutivePlayRequests (b/16539293)
               'media_unittests --gtest_filter=-AudioOutputControllerTest.PlayDivertSwitchDeviceRevertClose:AudioOutputControllerTest.PlaySwitchDeviceClose:AudioStreamHandlerTest.Play:AudioStreamHandlerTest.ConsecutivePlayRequests:PipelineIntegrationTest.BasicPlayback_MediaSource_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VideoOnly_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP9*:PipelineIntegrationTest.P444_VP9_WebM:PipelineIntegrationTest.BasicPlayback_VP8A*:OpusAudioDecoderTest/AudioDecoderTest.ProduceAudioSamples/0:SoundsManagerTest.Play',
-              'sync_unit_tests --gtest_filter=-SyncHttpBridgeTest.*',
               # DoAppendUTF8Invalid fails because of dcheck_always_on flag in Eng builds
               'url_unittests --gtest_filter=-URLCanonTest.DoAppendUTF8Invalid',
             ],
@@ -262,7 +260,6 @@
             '../media/midi/midi.gyp:midi_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
-            '../components/sync.gyp:sync_unit_tests_apk',
             '../ui/events/events_unittests.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
           ],

components/BUILD.gn

@@ -126,6 +126,7 @@ test("components_unittests") {
     "//components/subresource_filter/core/common:unit_tests",
     "//components/suggestions:unit_tests",
     "//components/supervised_user_error_page:unit_tests",
+    "//components/sync:unit_tests",
     "//components/sync_bookmarks:unit_tests",
     "//components/sync_driver:unit_tests",
     "//components/sync_sessions:unit_tests",

components/components_tests.gyp

@@ -832,6 +832,90 @@
     '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',
     ],
@@ -1101,6 +1185,7 @@
         '<@(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)',
@@ -1127,8 +1212,6 @@
         '../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',
@@ -1274,6 +1357,10 @@
         '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': [
@@ -1443,6 +1530,9 @@
             # component directory structure).
             ['exclude', '^[^/]*/content/'],
           ],
+          'sources!': [
+            'core/http_bridge_unittest.cc',
+          ],
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/ui_test.pak',
           ],

components/sync/BUILD.gn

@@ -609,8 +609,8 @@ static_library("test_support_sync_api") {
   ]
 }
 
-# GYP version: sync/sync_tests.gypi:sync_unit_tests
-test("sync_unit_tests") {
+source_set("unit_tests") {
+  testonly = true
   sources = [
     "api/attachments/attachment_id_unittest.cc",
     "api/attachments/attachment_metadata_unittest.cc",
@@ -712,7 +712,6 @@ test("sync_unit_tests") {
     ":test_support_sync_core",
     ":test_support_sync_core_impl",
     "//base",
-    "//base/test:run_all_unittests",
     "//components/sync",
     "//components/sync/protocol",
     "//google_apis",