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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7477004: Simulate transient error and verify exponential backoff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing a typo. Created 9 years, 5 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
« chrome/browser/sync/retry_verifier.h ('K') | « chrome/chrome_browser.gypi ('k') | chrome/test/live_sync/live_sync_test.h » ('j') | net/tools/testserver/chromiumsync.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 01235493849414a86e4ea32266e6d2dd28eb6956..5d453ab4d9fd93aabc46f50d6d42e6d23f8f7b56 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3531,11 +3531,15 @@
'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',
+<<<<<<< HEAD
'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/sync_errors_test.cc',
'test/live_sync/two_client_bookmarks_sync_test.cc',
+=======
+ 'test/live_sync/sync_errors_test.cc',
+>>>>>>> fix.
Raghu Simha 2011/08/05 18:04:52 Forgot to merge this?
lipalani1 2011/08/05 21:33:57 Done.
'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_extensions_sync_test.cc',
« chrome/browser/sync/retry_verifier.h ('K') | « chrome/chrome_browser.gypi ('k') | chrome/test/live_sync/live_sync_test.h » ('j') | net/tools/testserver/chromiumsync.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698