Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(433)

Side by Side Diff: net/quic/quic_clock.cc

Issue 16360017: Fix QuicClock::WallNow to return a correct value. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/quic/quic_clock_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/quic_clock.h" 5 #include "net/quic/quic_clock.h"
6 6
7 #include "base/time.h" 7 #include "base/time.h"
8 8
9 namespace net { 9 namespace net {
10 10
11 QuicClock::QuicClock() { 11 QuicClock::QuicClock() {
12 } 12 }
13 13
14 QuicClock::~QuicClock() {} 14 QuicClock::~QuicClock() {}
15 15
16 QuicTime QuicClock::ApproximateNow() const { 16 QuicTime QuicClock::ApproximateNow() const {
17 // Chrome does not have a distinct notion of ApproximateNow(). 17 // Chrome does not have a distinct notion of ApproximateNow().
18 return Now(); 18 return Now();
19 } 19 }
20 20
21 QuicTime QuicClock::Now() const { 21 QuicTime QuicClock::Now() const {
22 return QuicTime(base::TimeTicks::Now()); 22 return QuicTime(base::TimeTicks::Now());
23 } 23 }
24 24
25 QuicWallTime QuicClock::WallNow() const { 25 QuicWallTime QuicClock::WallNow() const {
26 return QuicWallTime::FromUNIXSeconds( 26 return QuicWallTime::FromUNIXSeconds(base::Time::Now().ToTimeT());
27 base::Time::Now().ToInternalValue() / 1000000);
28 } 27 }
29 28
30 } // namespace net 29 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/quic/quic_clock_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698