Land Recent QUIC changes

net/quic/quic_clock.h

Index: net/quic/quic_clock.h
diff --git a/net/quic/quic_clock.h b/net/quic/quic_clock.h
index 6b6cb31b9824cf84a2ff6ec8eca0ee9934d1932a..0b3ef4a9133ef1e5e2c6f5c83b6763240e2b7817 100644
--- a/net/quic/quic_clock.h
+++ b/net/quic/quic_clock.h
@@ -27,10 +27,9 @@ class NET_EXPORT_PRIVATE QuicClock {
   // Note: this use significant resources please use only if needed.
   virtual QuicTime Now() const;
 
-  // Returns the current time as an offset from the Unix epoch (1970-01-01
-  // 00:00:00 GMT). This function may return a smaller Delta in subsequent
-  // calls if the system clock is changed.
-  virtual QuicTime::Delta NowAsDeltaSinceUnixEpoch() const;
+  // WallNow returns the current wall-time - a time is consistent across
+  // different clocks.
+  virtual QuicWallTime WallNow() const;
 };
 
 }  // namespace net