Revert of Add chrome sync tests to the GN build.

chrome/chrome_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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 1217 matching lines @@
       'test/data/resource.rc',
       'browser/sync/test/integration/cross_platform_sync_test.cc',
       'browser/sync/test/integration/enable_disable_test.cc',
       'browser/sync/test/integration/migration_test.cc',
       'browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc',
       'browser/sync/test/integration/multiple_client_dictionary_sync_test.cc',
       'browser/sync/test/integration/multiple_client_passwords_sync_test.cc',
       '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',
       'browser/sync/test/integration/single_client_bookmarks_sync_test.cc',
       'browser/sync/test/integration/single_client_dictionary_sync_test.cc',
       'browser/sync/test/integration/single_client_extensions_sync_test.cc',
       'browser/sync/test/integration/single_client_passwords_sync_test.cc',
       'browser/sync/test/integration/single_client_preferences_sync_test.cc',
       'browser/sync/test/integration/single_client_search_engines_sync_test.cc',
       'browser/sync/test/integration/single_client_sessions_sync_test.cc',
@@ skipping 1329 matching lines @@
           ],
         }],
         ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],  # 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',
         '../components/components.gyp:invalidation_test_support',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../sync/sync.gyp:test_support_sync_testserver',
         '../sync/sync.gyp:test_support_sync_fake_server',
         '../ui/app_list/app_list.gyp:app_list_test_support',
@@ skipping 12 matching lines @@
       },
       'export_dependent_settings': [
         'browser',
       ],
       'sources': [
         '<@(test_support_sync_integration_sources)',
       ],
       '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',
             'browser/sync/test/integration/dictionary_load_observer.cc',
             'browser/sync/test/integration/dictionary_load_observer.h',
           ],
         }],
         ['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',
           ],
         }],
       ]
     },
     {
-      # GN version: //chrome/test:sync_integration_tests
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
         'common',
         'renderer',
         'test_support_common',
@@ skipping 30 matching lines @@
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
         }],
         ['OS=="mac"', {
           # The sync_integration_tests do not run on mac without this flag.
           # 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',
             'browser/sync/test/integration/two_client_dictionary_sync_test.cc',
           ],
         }],
         ['OS=="win"', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
@@ skipping 44 matching lines @@
           ],
         }],
         ['enable_managed_users==0', {
           'sources!': [
             'browser/sync/test/integration/single_client_supervised_user_settings_sync_test.cc',
           ],
         }],
       ],
     },
     {
-      # GN version: //chrome/test:sync_performance_tests
       'target_name': 'sync_performance_tests',
       'type': 'executable',
       'dependencies': [
         'test/perf/perf_test.gyp:*',
         'test_support_sync_integration',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
@@ skipping 458 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }