summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:35:35 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-13 06:35:35 +0000
commit1229f0b556f09ee6997684d5e6f799cf15228bb4 (patch)
tree4f1ed788e467263f8e4ce263e96d1e393e9646bd
parent1964d12e176788db130c82ca2e312e04dc97a6fa (diff)
downloadchromium_src-1229f0b556f09ee6997684d5e6f799cf15228bb4.zip
chromium_src-1229f0b556f09ee6997684d5e6f799cf15228bb4.tar.gz
chromium_src-1229f0b556f09ee6997684d5e6f799cf15228bb4.tar.bz2
Use just TimeTicks::Now in the chrome/browser/sync test code.
The situations when we need to use HighResNow are really rare, and I believe this is not one of them. TEST=none BUG=none Review URL: http://codereview.chromium.org/2042013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47124 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/engine/syncer_thread_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc
index 77205d19..946978b 100644
--- a/chrome/browser/sync/engine/syncer_thread_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc
@@ -86,11 +86,11 @@ class SyncerThreadWithSyncerTest : public testing::Test,
// Wait for the SyncerThread to detect loss of connection, up to a max of
// 10 seconds to timeout the test.
AutoLock lock(syncer_thread()->lock_);
- TimeTicks start = TimeTicks::HighResNow();
+ TimeTicks start = TimeTicks::Now();
TimeDelta ten_seconds = TimeDelta::FromSeconds(10);
while (syncer_thread()->vault_.connected_) {
syncer_thread()->vault_field_changed_.TimedWait(ten_seconds);
- if (TimeTicks::HighResNow() - start > ten_seconds)
+ if (TimeTicks::Now() - start > ten_seconds)
break;
}
EXPECT_FALSE(syncer_thread()->vault_.connected_);