summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:14:20 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:14:20 +0000
commita8c05fb32537aa53688a390f01c7c5fad8946091 (patch)
tree204a1178b3040b728396ed411ef204b38c5e08a2 /net
parentedc2b1b35a885a0b7155e0c5349366ccca050645 (diff)
downloadchromium_src-a8c05fb32537aa53688a390f01c7c5fad8946091.zip
chromium_src-a8c05fb32537aa53688a390f01c7c5fad8946091.tar.gz
chromium_src-a8c05fb32537aa53688a390f01c7c5fad8946091.tar.bz2
Use base::TimeTicks instead of base::Time to resolve flaky tests using local_test_server_posix.cc.
BUG=230125 TBR=akalin Review URL: https://chromiumcodereview.appspot.com/13890022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/test/local_test_server_posix.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/test/local_test_server_posix.cc b/net/test/local_test_server_posix.cc
index f655b97..27fe282 100644
--- a/net/test/local_test_server_posix.cc
+++ b/net/test/local_test_server_posix.cc
@@ -60,7 +60,7 @@ class OrphanedTestServerFilter : public base::ProcessFilter {
bool ReadData(int fd, ssize_t bytes_max, uint8* buffer,
base::TimeDelta* remaining_time) {
ssize_t bytes_read = 0;
- base::Time previous_time = base::Time::Now();
+ base::TimeTicks previous_time = base::TimeTicks::Now();
while (bytes_read < bytes_max) {
struct pollfd poll_fds[1];
@@ -79,7 +79,7 @@ bool ReadData(int fd, ssize_t bytes_max, uint8* buffer,
return false;
}
- base::Time current_time = base::Time::Now();
+ base::TimeTicks current_time = base::TimeTicks::Now();
base::TimeDelta elapsed_time_cycle = current_time - previous_time;
DCHECK_GE(elapsed_time_cycle.InMilliseconds(), 0);
*remaining_time -= elapsed_time_cycle;