[Sync] Merge sync_unit_tests into components_unit_tests.

BUG=626114

Review-Url: https://codereview.chromium.org/2186733002
Cr-Original-Commit-Position: refs/heads/master@{#409060}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9f7c262325b965be2a51475650d542c9791eee9d

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', {

android/pylib/gtest/gtest_config.py

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

android/pylib/gtest/gtest_test_instance.py

@@ -42,7 +42,6 @@ _DEFAULT_ISOLATE_FILE_PATHS = {
     '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':

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',