Fix race condition in test Pause method.

chrome/browser/sync/engine/syncer_thread_unittest.cc

 // Copyright (c) 2009 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.
 
 #include <list>
 #include <map>
 #include <set>
 
+#include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/engine/syncer_thread.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/sessions/sync_session_context.h"
 #include "chrome/browser/sync/util/channel.h"
 #include "chrome/test/sync/engine/mock_connection_manager.h"
 #include "chrome/test/sync/engine/test_directory_setter_upper.h"
@@ skipping 90 matching lines @@
     while (syncer_thread()->vault_.connected_) {
       syncer_thread()->vault_field_changed_.TimedWait(ten_seconds);
       if (TimeTicks::Now() - start > ten_seconds)
         break;
     }
     EXPECT_FALSE(syncer_thread()->vault_.connected_);
   }
 
   bool Pause(ListenerMock* listener) {
     WaitableEvent event(false, false);
-    EXPECT_CALL(*listener, HandleChannelEvent(
-        Field(&SyncerEvent::what_happened, SyncerEvent::PAUSED))).
-        WillOnce(SignalEvent(&event));
+    {
+      AutoLock lock(syncer_thread()->lock_);
+      EXPECT_CALL(*listener, HandleChannelEvent(
+          Field(&SyncerEvent::what_happened, SyncerEvent::PAUSED))).
+          WillOnce(SignalEvent(&event));
+    }
     if (!syncer_thread()->RequestPause())
       return false;
     return event.TimedWait(max_wait_time_);
   }
 
   bool Resume(ListenerMock* listener) {
     WaitableEvent event(false, false);
-    EXPECT_CALL(*listener, HandleChannelEvent(
-        Field(&SyncerEvent::what_happened, SyncerEvent::RESUMED))).
-        WillOnce(SignalEvent(&event));
+    {
+      AutoLock lock(syncer_thread()->lock_);
+      EXPECT_CALL(*listener, HandleChannelEvent(
+          Field(&SyncerEvent::what_happened, SyncerEvent::RESUMED))).
+          WillOnce(SignalEvent(&event));
+    }
     if (!syncer_thread()->RequestResume())
       return false;
     return event.TimedWait(max_wait_time_);
   }
 
   void PreventThreadFromPolling() {
     const TimeDelta poll_interval = TimeDelta::FromMinutes(5);
     syncer_thread()->SetSyncerShortPollInterval(poll_interval);
   }
 
@@ skipping 651 matching lines @@
   EXPECT_FALSE(interceptor.times_sync_occured().empty());
 
   EXPECT_TRUE(syncer_thread()->Stop(2000));
 }
 
 // TODO(skrul): The "Pause" and "PauseWhenNotConnected" tests are
 // marked FLAKY because they sometimes fail on the Windows buildbots.
 // 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.
-#if defined(OS_WIN)
-#define MAYBE_Pause DISABLED_Pause
-#else
-#define MAYBE_Pause Pause
-#endif
-TEST_F(SyncerThreadWithSyncerTest, MAYBE_Pause) {
+TEST_F(SyncerThreadWithSyncerTest, FLAKY_Pause) {
   WaitableEvent sync_cycle_ended_event(false, false);
   WaitableEvent paused_event(false, false);
   WaitableEvent resumed_event(false, false);
   PreventThreadFromPolling();
 
   ListenerMock listener;
   scoped_ptr<ChannelHookup<SyncerEvent> > hookup;
   hookup.reset(syncer_thread()->relay_channel()->AddObserver(&listener));
 
   EXPECT_CALL(listener, HandleChannelEvent(
@@ skipping 183 matching lines @@
       WillOnce(SignalEvent(&sync_cycle_ended_event));
   EXPECT_CALL(listener, HandleChannelEvent(
       Field(&SyncerEvent::what_happened, SyncerEvent::SYNCER_THREAD_EXITING)));
 
   ASSERT_TRUE(Resume(&listener));
   ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_));
   EXPECT_TRUE(syncer_thread()->Stop(2000));
 }
 
 }  // namespace browser_sync