summaryrefslogtreecommitdiffstats
path: root/net/quic
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 01:31:55 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 01:31:55 +0000
commitb75080805336e8c0417f0ca59da3abaf7bceb986 (patch)
tree39b293bc814ec60f8d248760aa841b16c775fbd6 /net/quic
parent7416aa39acd0d5ec02b0a2647756077a483f289b (diff)
downloadchromium_src-b75080805336e8c0417f0ca59da3abaf7bceb986.zip
chromium_src-b75080805336e8c0417f0ca59da3abaf7bceb986.tar.gz
chromium_src-b75080805336e8c0417f0ca59da3abaf7bceb986.tar.bz2
MockClock needs to mock the NowAsDeltaSinceUnixEpoch method.
Remove the declaration of an undefined AdvanceTime method. R=rch@chromium.org BUG=none TEST=QuicClientSessionTest.CryptoConnectSendsCorrectData does not fail with different Unix timestamps in ClientHello even when the machine is slow. Review URL: https://chromiumcodereview.appspot.com/11956029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic')
-rw-r--r--net/quic/test_tools/mock_clock.cc4
-rw-r--r--net/quic/test_tools/mock_clock.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/net/quic/test_tools/mock_clock.cc b/net/quic/test_tools/mock_clock.cc
index 557d8db..528865b 100644
--- a/net/quic/test_tools/mock_clock.cc
+++ b/net/quic/test_tools/mock_clock.cc
@@ -21,6 +21,10 @@ QuicTime MockClock::Now() const {
return now_;
}
+QuicTime::Delta MockClock::NowAsDeltaSinceUnixEpoch() const {
+ return now_.Subtract(QuicTime());
+}
+
base::TimeTicks MockClock::NowInTicks() const {
base::TimeTicks ticks;
return ticks + base::TimeDelta::FromMicroseconds(
diff --git a/net/quic/test_tools/mock_clock.h b/net/quic/test_tools/mock_clock.h
index bbaf343..e1e84c7 100644
--- a/net/quic/test_tools/mock_clock.h
+++ b/net/quic/test_tools/mock_clock.h
@@ -23,9 +23,9 @@ class MockClock : public QuicClock {
virtual QuicTime Now() const OVERRIDE;
- base::TimeTicks NowInTicks() const;
+ virtual QuicTime::Delta NowAsDeltaSinceUnixEpoch() const OVERRIDE;
- void AdvanceTime(QuicTime delta);
+ base::TimeTicks NowInTicks() const;
private:
QuicTime now_;