Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 3469 matching lines @@
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
         'test/out_of_proc_test_runner.cc',
-        'test/live_sync/bookmark_model_verifier.cc',
-        'test/live_sync/bookmark_model_verifier.h',
+        'test/live_sync/bookmarks_helper.cc',
+        'test/live_sync/bookmarks_helper.h',
         'test/live_sync/live_apps_sync_test.cc',
         'test/live_sync/live_apps_sync_test.h',
         'test/live_sync/live_autofill_sync_test.cc',
         'test/live_sync/live_autofill_sync_test.h',
-        'test/live_sync/live_bookmarks_sync_test.cc',
-        'test/live_sync/live_bookmarks_sync_test.h',
         'test/live_sync/live_extensions_sync_test.cc',
         'test/live_sync/live_extensions_sync_test.h',
         'test/live_sync/live_passwords_sync_test.cc',
         'test/live_sync/live_passwords_sync_test.h',
-        'test/live_sync/live_preferences_sync_test.cc',
-        'test/live_sync/live_preferences_sync_test.h',
         'test/live_sync/live_sessions_sync_test.cc',
         'test/live_sync/live_sessions_sync_test.h',
         'test/live_sync/live_themes_sync_test.cc',
         'test/live_sync/live_themes_sync_test.h',
         'test/live_sync/live_typed_urls_sync_test.cc',
         'test/live_sync/live_typed_urls_sync_test.h',
         'test/live_sync/live_sync_extension_helper.cc',
         'test/live_sync/live_sync_extension_helper.h',
         'test/live_sync/live_sync_test.cc',
         'test/live_sync/live_sync_test.h',
-        'test/live_sync/many_client_live_bookmarks_sync_test.cc',
+        'test/live_sync/many_client_bookmarks_sync_test.cc',
         'test/live_sync/many_client_live_passwords_sync_test.cc',
-        'test/live_sync/many_client_live_preferences_sync_test.cc',
+        'test/live_sync/many_client_preferences_sync_test.cc',
         'test/live_sync/migration_errors_test.cc',
-        'test/live_sync/multiple_client_live_bookmarks_sync_test.cc',
+        'test/live_sync/multiple_client_bookmarks_sync_test.cc',
         'test/live_sync/multiple_client_live_passwords_sync_test.cc',
-        'test/live_sync/multiple_client_live_preferences_sync_test.cc',
         'test/live_sync/multiple_client_live_sessions_sync_test.cc',
         'test/live_sync/multiple_client_live_typed_urls_sync_test.cc',
+        'test/live_sync/multiple_client_preferences_sync_test.cc',
+        'test/live_sync/preferences_helper.cc',
+        'test/live_sync/preferences_helper.h',
+        'test/live_sync/single_client_bookmarks_sync_test.cc',
         'test/live_sync/single_client_live_apps_sync_test.cc',
-        'test/live_sync/single_client_live_bookmarks_sync_test.cc',
         'test/live_sync/single_client_live_extensions_sync_test.cc',
         'test/live_sync/single_client_live_passwords_sync_test.cc',
-        'test/live_sync/single_client_live_preferences_sync_test.cc',
         'test/live_sync/single_client_live_sessions_sync_test.cc',
         'test/live_sync/single_client_live_themes_sync_test.cc',
         'test/live_sync/single_client_live_typed_urls_sync_test.cc',
+        'test/live_sync/single_client_preferences_sync_test.cc',
+        'test/live_sync/sync_datatype_helper.cc',
+        'test/live_sync/sync_datatype_helper.h',
+        'test/live_sync/two_client_bookmarks_sync_test.cc',
         'test/live_sync/two_client_live_apps_sync_test.cc',
         'test/live_sync/two_client_live_autofill_sync_test.cc',
-        'test/live_sync/two_client_live_bookmarks_sync_test.cc',
         'test/live_sync/two_client_live_extensions_sync_test.cc',
-        'test/live_sync/two_client_live_preferences_sync_test.cc',
         'test/live_sync/two_client_live_passwords_sync_test.cc',
         'test/live_sync/two_client_live_sessions_sync_test.cc',
         'test/live_sync/two_client_live_themes_sync_test.cc',
         'test/live_sync/two_client_live_typed_urls_sync_test.cc',
+        'test/live_sync/two_client_preferences_sync_test.cc',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
         'test/data/resource.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
            'dependencies': [
@@ skipping 72 matching lines @@
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'browser/password_manager/password_form_data.cc',
         'test/out_of_proc_test_runner.cc',
-        'test/live_sync/bookmark_model_verifier.cc',
-        'test/live_sync/bookmark_model_verifier.h',
+        'test/live_sync/bookmarks_helper.cc',
+        'test/live_sync/bookmarks_helper.h',
         'test/live_sync/live_autofill_sync_test.cc',
         'test/live_sync/live_autofill_sync_test.h',
-        'test/live_sync/live_bookmarks_sync_test.cc',
-        'test/live_sync/live_bookmarks_sync_test.h',
         'test/live_sync/live_extensions_sync_test.cc',
         'test/live_sync/live_extensions_sync_test.h',
         'test/live_sync/live_passwords_sync_test.cc',
         'test/live_sync/live_passwords_sync_test.h',
         'test/live_sync/live_typed_urls_sync_test.cc',
         'test/live_sync/live_typed_urls_sync_test.h',
         'test/live_sync/live_sync_extension_helper.cc',
         'test/live_sync/live_sync_extension_helper.h',
         'test/live_sync/live_sync_test.cc',
         'test/live_sync/live_sync_test.h',
         'test/live_sync/performance/autofill_sync_perf_test.cc',
         'test/live_sync/performance/bookmarks_sync_perf_test.cc',
         'test/live_sync/performance/extensions_sync_perf_test.cc',
         'test/live_sync/performance/sync_timing_helper.cc',
         'test/live_sync/performance/sync_timing_helper.h',
         'test/live_sync/performance/passwords_sync_perf_test.cc',
         'test/live_sync/performance/typed_urls_sync_perf_test.cc',
+        'test/live_sync/sync_datatype_helper.cc',
+        'test/live_sync/sync_datatype_helper.h',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:ssl',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
@@ skipping 689 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }