Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6529)

Unified Diff: chrome/chrome_tests.gypi

Issue 1256803002: [Smart Lock, Prefs reconciliation] Prefs migration logic for desktop platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add guard Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d19e9425e9708a4199ae15f9b1f08285dc0c23d0..ce79590b45fcfcf72fb73ee538919bb204ea6ad2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1403,6 +1403,7 @@
'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_password_manager_setting_migrater_service_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',
@@ -1415,6 +1416,7 @@
'browser/sync/test/integration/single_client_directory_sync_test.cc',
'browser/sync/test/integration/single_client_e2e_test.cc',
'browser/sync/test/integration/single_client_extensions_sync_test.cc',
+ 'browser/sync/test/integration/single_client_password_manager_setting_migrater_service_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',
@@ -1435,6 +1437,7 @@
'browser/sync/test/integration/two_client_e2e_test.cc',
'browser/sync/test/integration/two_client_extension_settings_and_app_settings_sync_test.cc',
'browser/sync/test/integration/two_client_extensions_sync_test.cc',
+ 'browser/sync/test/integration/two_client_password_manager_setting_migrater_service_sync_test.cc',
'browser/sync/test/integration/two_client_passwords_sync_test.cc',
'browser/sync/test/integration/two_client_preferences_sync_test.cc',
'browser/sync/test/integration/two_client_search_engines_sync_test.cc',

Powered by Google App Engine
This is Rietveld 408576698