Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 86738793a999fc30ecc72dad6ebfae81081766e5..6c917928c829f0887478a46199556233d6242a31 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -3286,22 +3286,18 @@ |
'test/base/test_notification_tracker.cc', |
'test/base/test_notification_tracker.h', |
'test/data/resource.rc', |
+ 'test/live_sync/apps_helper.cc', |
+ 'test/live_sync/apps_helper.h', |
'test/live_sync/autofill_helper.cc', |
'test/live_sync/autofill_helper.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_extensions_sync_test.cc', |
- 'test/live_sync/live_extensions_sync_test.h', |
+ 'test/live_sync/extensions_helper.cc', |
+ 'test/live_sync/extensions_helper.h', |
'test/live_sync/live_passwords_sync_test.cc', |
'test/live_sync/live_passwords_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_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_bookmarks_sync_test.cc', |
@@ -3315,25 +3311,29 @@ |
'test/live_sync/multiple_client_typed_urls_sync_test.cc', |
'test/live_sync/preferences_helper.cc', |
'test/live_sync/preferences_helper.h', |
+ 'test/live_sync/single_client_apps_sync_test.cc', |
'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_extensions_sync_test.cc', |
+ 'test/live_sync/single_client_extensions_sync_test.cc', |
'test/live_sync/single_client_live_passwords_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_preferences_sync_test.cc', |
+ 'test/live_sync/single_client_themes_sync_test.cc', |
'test/live_sync/single_client_typed_urls_sync_test.cc', |
'test/live_sync/sync_datatype_helper.cc', |
'test/live_sync/sync_datatype_helper.h', |
'test/live_sync/sync_errors_test.cc', |
+ 'test/live_sync/sync_extension_helper.cc', |
+ 'test/live_sync/sync_extension_helper.h', |
+ 'test/live_sync/themes_helper.cc', |
+ 'test/live_sync/themes_helper.h', |
+ 'test/live_sync/two_client_apps_sync_test.cc', |
'test/live_sync/two_client_autofill_sync_test.cc', |
'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_extensions_sync_test.cc', |
+ 'test/live_sync/two_client_extensions_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_preferences_sync_test.cc', |
+ 'test/live_sync/two_client_themes_sync_test.cc', |
'test/live_sync/two_client_typed_urls_sync_test.cc', |
'test/live_sync/typed_urls_helper.cc', |
'test/live_sync/typed_urls_helper.h', |
@@ -3436,14 +3436,12 @@ |
'test/live_sync/autofill_helper.h', |
'test/live_sync/bookmarks_helper.cc', |
'test/live_sync/bookmarks_helper.h', |
- 'test/live_sync/live_extensions_sync_test.cc', |
- 'test/live_sync/live_extensions_sync_test.h', |
+ 'test/live_sync/extensions_helper.cc', |
+ 'test/live_sync/extensions_helper.h', |
'test/live_sync/live_passwords_sync_test.cc', |
'test/live_sync/live_passwords_sync_test.h', |
'test/live_sync/live_sessions_sync_test.cc', |
'test/live_sync/live_sessions_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', |
@@ -3456,6 +3454,8 @@ |
'test/live_sync/performance/typed_urls_sync_perf_test.cc', |
'test/live_sync/sync_datatype_helper.cc', |
'test/live_sync/sync_datatype_helper.h', |
+ 'test/live_sync/sync_extension_helper.cc', |
+ 'test/live_sync/sync_extension_helper.h', |
'test/live_sync/typed_urls_helper.cc', |
'test/live_sync/typed_urls_helper.h', |
], |