Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 1c3c4ad16da217ed26bb37f47d57a917e22f656f..1db1caf3a282a86cd8a84db7ba0a9770a2af90c5 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -3398,8 +3398,6 @@ |
'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', |
@@ -3414,33 +3412,35 @@ |
'test/live_sync/live_sync_timing_helper.h', |
'test/live_sync/many_client_live_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_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_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_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/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', |