diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 18:32:47 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-29 18:32:47 +0000 |
| commit | 5c059011b632302143e9a9aeb5b8419f5cb45e01 (patch) | |
| tree | cf4436922501419afbe4967d4ea80e6ad743785b | |
| parent | ba9a3e0fb2f108130912873aa952b1e7eea9cfa5 (diff) | |
| download | chromium_src-5c059011b632302143e9a9aeb5b8419f5cb45e01.zip chromium_src-5c059011b632302143e9a9aeb5b8419f5cb45e01.tar.gz chromium_src-5c059011b632302143e9a9aeb5b8419f5cb45e01.tar.bz2 | |
Reverting to fix the vista sync_unit_tests failures.
Revert 42959 - Make sure we poll immediately on the first syncer loop.
BUG=36460
TEST=Try to enable sync on an Ubuntu VM that has been running less than 8 hours, and make sure it succeeds
Review URL: http://codereview.chromium.org/1421003
TBR=zork@chromium.org
Review URL: http://codereview.chromium.org/1568003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42968 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index 7e62e7c..33354d0 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -262,7 +262,7 @@ void SyncerThread::ThreadMainLoop() { // We block until the CV is signaled (e.g a control field changed, loss of // network connection, nudge, spurious, etc), or the poll interval elapses. TimeDelta sleep_time = end_wait - TimeTicks::Now(); - if (initial_sync_for_thread || sleep_time > TimeDelta::FromSeconds(0)) { + if (sleep_time > TimeDelta::FromSeconds(0)) { vault_field_changed_.TimedWait(sleep_time); if (TimeTicks::Now() < end_wait) { |