| Index: chrome/browser/sync/engine/syncer_thread_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc
|
| index 3d2c83dc75f833571c3cdbf9f1b6569e2380c65c..79e26653366c82af1b6615d6b17051a7383dab58 100644
|
| --- a/chrome/browser/sync/engine/syncer_thread_unittest.cc
|
| +++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc
|
| @@ -763,9 +763,15 @@ TEST_F(SyncerThreadWithSyncerTest, AuthInvalid) {
|
| // I have been unable to reproduce this hang after extensive testing
|
| // on a local Windows machine so these tests will remain flaky in
|
| // order to help diagnose the problem.
|
| -//
|
| +// oshima: this is actually crashing and cause failure on XP Tests.
|
| +// Disabling on windows.
|
| // This issue is tracked at http://crbug.com/39070.
|
| -TEST_F(SyncerThreadWithSyncerTest, FLAKY_Pause) {
|
| +#if defined(OS_WIN)
|
| +#define MAYBE_Pause DISABLED_Pause
|
| +#else
|
| +#define MAYBE_Pause Pause
|
| +#endif
|
| +TEST_F(SyncerThreadWithSyncerTest, MAYBE_Pause) {
|
| WaitableEvent sync_cycle_ended_event(false, false);
|
| WaitableEvent paused_event(false, false);
|
| WaitableEvent resumed_event(false, false);
|
|
|