From c1d12339b6bf13ec57c1720304e48257ef77e2d6 Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Thu, 11 Nov 2010 23:48:19 +0000 Subject: Fix race in syncer thread unit test. BUG=62876 TEST=unit_test and tsan Review URL: http://codereview.chromium.org/4833001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65876 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/sync/engine/syncer_thread_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser') diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc index abc31a5..add70ae 100644 --- a/chrome/browser/sync/engine/syncer_thread_unittest.cc +++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc @@ -724,10 +724,10 @@ TEST_F(SyncerThreadWithSyncerTest, FLAKY_NudgeWithDataTypes) { interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(1)); EXPECT_EQ(static_cast(2), interceptor.times_sync_occured().size()); - EXPECT_TRUE(syncer_thread()->vault_.pending_nudge_types_.none()); // 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) { -- cgit v1.1