diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 23:48:19 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 23:48:19 +0000 |
| commit | c1d12339b6bf13ec57c1720304e48257ef77e2d6 (patch) | |
| tree | f14b3769a4b2b49efba6f79ee8e643d74d43fbe3 /chrome | |
| parent | 6d090736af69b0a74e35cb8653d323c5defcd2ff (diff) | |
| download | chromium_src-c1d12339b6bf13ec57c1720304e48257ef77e2d6.zip chromium_src-c1d12339b6bf13ec57c1720304e48257ef77e2d6.tar.gz chromium_src-c1d12339b6bf13ec57c1720304e48257ef77e2d6.tar.bz2 | |
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
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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<unsigned int>(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) { |