Revert of Add chrome sync tests to the GN build.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 447fb55905c0c3bd4052728d6f7573a6728278d5..6d05f6e02428f11750e10fe0b3642d2cc7965cc0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1235,6 +1235,14 @@
       'browser/sync/test/integration/multiple_client_preferences_sync_test.cc',
       'browser/sync/test/integration/multiple_client_sessions_sync_test.cc',
       'browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc',
+      'browser/sync/test/integration/passwords_helper.cc',
+      'browser/sync/test/integration/passwords_helper.h',
+      'browser/sync/test/integration/preferences_helper.cc',
+      'browser/sync/test/integration/preferences_helper.h',
+      'browser/sync/test/integration/search_engines_helper.cc',
+      'browser/sync/test/integration/search_engines_helper.h',
+      'browser/sync/test/integration/sessions_helper.cc',
+      'browser/sync/test/integration/sessions_helper.h',
       'browser/sync/test/integration/single_client_app_list_sync_test.cc',
       'browser/sync/test/integration/single_client_apps_sync_test.cc',
       'browser/sync/test/integration/single_client_backup_rollback_test.cc',
@@ -2584,11 +2592,11 @@
       ],  # conditions
     },  # target performance_browser_tests
     {
-      # GN version: //chrome/test:sync_integration_test_support
       'target_name': 'test_support_sync_integration',
       'type': 'static_library',
       'dependencies': [
         'browser',
+        'chrome',
         'test_support_common',
         '../base/base.gyp:base',
         '../components/components.gyp:invalidation',
@@ -2621,7 +2629,6 @@
       'conditions': [
         ['OS=="mac"', {
           # Dictionary sync is disabled on Mac.
-          # Note: this list is duplicated in the GN build.
           'sources!': [
             'browser/sync/test/integration/dictionary_helper.cc',
             'browser/sync/test/integration/dictionary_helper.h',
@@ -2630,7 +2637,6 @@
           ],
         }],
         ['enable_app_list==0', {
-          # Note: this list is duplicated in the GN build.
           'sources!': [
             'browser/sync/test/integration/sync_app_list_helper.cc',
             'browser/sync/test/integration/sync_app_list_helper.h',
@@ -2639,7 +2645,6 @@
       ]
     },
     {
-      # GN version: //chrome/test:sync_integration_tests
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
@@ -2690,7 +2695,6 @@
           # Search for comments about "xcode_settings" elsewhere in this file.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
           # Dictionary sync is disabled on Mac.
-          # Note: list duplicated in GN build.
           'sources!': [
             'browser/sync/test/integration/multiple_client_dictionary_sync_test.cc',
             'browser/sync/test/integration/single_client_dictionary_sync_test.cc',
@@ -2755,7 +2759,6 @@
       ],
     },
     {
-      # GN version: //chrome/test:sync_performance_tests
       'target_name': 'sync_performance_tests',
       'type': 'executable',
       'dependencies': [