Sync: Fix RequestResume in SyncerThread, and re-enable the various unit tests...

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 "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
@@ skipping 679 matching lines @@
   // immediately (5ms).
   syncer_thread()->NudgeSyncer(5, SyncerThread::kUnknown);
   interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(1));
   EXPECT_EQ(static_cast<unsigned int>(2),
       interceptor.times_sync_occured().size());
 
   // SyncerThread should be waiting again.  Signal it to stop.
   EXPECT_TRUE(syncer_thread()->Stop(2000));
 }
 
-
-
-// Disabled (Bug 62880).
-// TODO(zea): Fix RequestPause/RequestResume and get this working.
-TEST_F(SyncerThreadWithSyncerTest, DISABLED_NudgeWithDataTypes) {
+TEST_F(SyncerThreadWithSyncerTest, NudgeWithDataTypes) {
   SyncShareIntercept interceptor;
   connection()->SetMidCommitObserver(&interceptor);
   // We don't want a poll to happen during this test (except the first one).
   PreventThreadFromPolling();
   EXPECT_TRUE(syncer_thread()->Start());
   metadb()->Open();
   syncer_thread()->CreateSyncer(metadb()->name());
   const TimeDelta poll_interval = TimeDelta::FromMinutes(5);
   interceptor.WaitForSyncShare(1, poll_interval + poll_interval);
-
   EXPECT_EQ(static_cast<unsigned int>(1),
             interceptor.times_sync_occured().size());
+
   // The SyncerThread should be waiting for the poll now.  Nudge it to sync
   // immediately (5ms).
   syncable::ModelTypeBitSet model_types;
   model_types[syncable::BOOKMARKS] = true;
+
+  // Paused so we can verify the nudge types safely.
+  syncer_thread()->RequestPause();
   syncer_thread()->NudgeSyncerWithDataTypes(5,
       SyncerThread::kUnknown,
       model_types);
   EXPECT_EQ(model_types, syncer_thread()->vault_.pending_nudge_types_);
+  syncer_thread()->RequestResume();
+
   interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(1));
   EXPECT_EQ(static_cast<unsigned int>(2),
       interceptor.times_sync_occured().size());
 
   // SyncerThread should be waiting again.  Signal it to stop.
   EXPECT_TRUE(syncer_thread()->Stop(2000));
   EXPECT_TRUE(syncer_thread()->vault_.pending_nudge_types_.none());
 }
 
 TEST_F(SyncerThreadWithSyncerTest, Throttling) {
@@ skipping 104 matching lines @@
                              HttpResponse::SERVER_CONNECTION_OK,
                              true};
   connection()->channel()->NotifyListeners(e);
 
   interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(10));
   EXPECT_FALSE(interceptor.times_sync_occured().empty());
 
   EXPECT_TRUE(syncer_thread()->Stop(2000));
 }
 
-// TODO(skrul): The "Pause" and "PauseWhenNotConnected" tests are
-// marked DISABLED because they sometimes fail on the Windows buildbots.
-// I have been unable to reproduce this hang after extensive testing
-// on a local Windows machine.
-TEST_F(SyncerThreadWithSyncerTest, DISABLED_Pause) {
+TEST_F(SyncerThreadWithSyncerTest, Pause) {
   WaitableEvent sync_cycle_ended_event(false, false);
   WaitableEvent paused_event(false, false);
   WaitableEvent resumed_event(false, false);
   PreventThreadFromPolling();
 
   ListenerMock listener;
   TestScopedSessionEventListener reg(context_, &listener);
   EXPECT_CALL(listener, OnSyncEngineEvent(
       Field(&SyncEngineEvent::what_happened,
       SyncEngineEvent::STATUS_CHANGED))).
@@ skipping 84 matching lines @@
   EXPECT_CALL(listener, OnSyncEngineEvent(
       Field(&SyncEngineEvent::what_happened,
       SyncEngineEvent::SYNC_CYCLE_ENDED))).
       WillOnce(SignalEvent(&sync_cycle_ended_event));
   syncer_thread()->NudgeSyncer(0, SyncerThread::kUnknown);
   ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_));
 
   EXPECT_TRUE(syncer_thread()->Stop(2000));
 }
 
-// TODO(skrul): See TODO comment on the "Pause" test above for an
-// explanation of the usage of DISABLED here.
-// TODO(pinkerton): disabled due to hanging on test bots http://crbug.com/39070
-TEST_F(SyncerThreadWithSyncerTest, DISABLED_PauseWhenNotConnected) {
+TEST_F(SyncerThreadWithSyncerTest, PauseWhenNotConnected) {
   WaitableEvent sync_cycle_ended_event(false, false);
   WaitableEvent event(false, false);
   ListenerMock listener;
   TestScopedSessionEventListener reg(context_, &listener);
   PreventThreadFromPolling();
 
   EXPECT_CALL(listener, OnSyncEngineEvent(
       Field(&SyncEngineEvent::what_happened,
       SyncEngineEvent::STATUS_CHANGED))).
       Times(AnyNumber());
@@ skipping 99 matching lines @@
   EXPECT_CALL(listener, OnSyncEngineEvent(
       Field(&SyncEngineEvent::what_happened,
       SyncEngineEvent::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