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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 7dd6857c0183eb44f7c62d10b478baa63956d365..eef4c2d5e27bb451d5dad3662a05b7d370af4956 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3416,20 +3416,16 @@
         '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',
@@ -3442,35 +3438,39 @@
         'test/live_sync/live_sync_test.h',
         'test/live_sync/live_sync_timing_helper.cc',
         'test/live_sync/live_sync_timing_helper.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/performance_bookmarks_sync_test.cc',
         'test/live_sync/performance_live_autofill_sync_test.cc',
-        'test/live_sync/performance_live_bookmarks_sync_test.cc',
         'test/live_sync/performance_live_extensions_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',