Simulate transient error and verify exponential backoff.

chrome/chrome_tests.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 3513 matching lines @@
         'test/live_sync/multiple_client_preferences_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_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_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',
         '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',
@@ skipping 809 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }