Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

net/tools/quic/quic_epoll_clock.h

Index: net/tools/quic/quic_epoll_clock.h
diff --git a/net/tools/quic/quic_epoll_clock.h b/net/tools/quic/quic_epoll_clock.h
index c5a1390bd242aa1625edb3c3d9b927fe696286ee..b5eafc882d8191cbc071527b2924f84702c8b014 100644
--- a/net/tools/quic/quic_epoll_clock.h
+++ b/net/tools/quic/quic_epoll_clock.h
@@ -27,9 +27,13 @@ class QuicEpollClock : public QuicClock {
   QuicTime ApproximateNow() const override;
 
   // Returns the current time as a QuicTime object.
-  // Note: this use significant resources please use only if needed.
+  // Note: this uses significant resources, please use only if needed.
   QuicTime Now() const override;
 
+  // Returns the current time as a QuicWallTime object.
+  // Note: this uses significant resources, please use only if needed.
+  QuicWallTime WallNow() const override;
+
  protected:
   EpollServer* epoll_server_;