Land Recent QUIC changes

net/tools/quic/quic_epoll_clock_test.cc

Index: net/tools/quic/quic_epoll_clock_test.cc
diff --git a/net/tools/quic/quic_epoll_clock_test.cc b/net/tools/quic/quic_epoll_clock_test.cc
index 5d7c6b9e6c5f2f1632f519356274b680c88b5a5c..14276ca5948b48467b645796ad322c8e1307d1ba 100644
--- a/net/tools/quic/quic_epoll_clock_test.cc
+++ b/net/tools/quic/quic_epoll_clock_test.cc
@@ -18,14 +18,15 @@ TEST(QuicEpollClockTest, ApproximateNowInUsec) {
   epoll_server.set_now_in_usec(1000000);
   EXPECT_EQ(1000000,
             clock.ApproximateNow().Subtract(QuicTime::Zero()).ToMicroseconds());
-  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(1000000),
-            clock.NowAsDeltaSinceUnixEpoch());
+  EXPECT_EQ(1u, clock.WallNow().ToUNIXSeconds());
 
   epoll_server.AdvanceBy(5);
   EXPECT_EQ(1000005,
             clock.ApproximateNow().Subtract(QuicTime::Zero()).ToMicroseconds());
-  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(1000005),
-            clock.NowAsDeltaSinceUnixEpoch());
+  EXPECT_EQ(1u, clock.WallNow().ToUNIXSeconds());
+
+  epoll_server.AdvanceBy(10 * 1000000);
+  EXPECT_EQ(11u, clock.WallNow().ToUNIXSeconds());
 }
 
 TEST(QuicEpollClockTest, NowInUsec) {
@@ -35,14 +36,10 @@ TEST(QuicEpollClockTest, NowInUsec) {
   epoll_server.set_now_in_usec(1000000);
   EXPECT_EQ(1000000,
             clock.Now().Subtract(QuicTime::Zero()).ToMicroseconds());
-  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(1000000),
-            clock.NowAsDeltaSinceUnixEpoch());
 
   epoll_server.AdvanceBy(5);
   EXPECT_EQ(1000005,
             clock.Now().Subtract(QuicTime::Zero()).ToMicroseconds());
-  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(1000005),
-            clock.NowAsDeltaSinceUnixEpoch());
 }
 
 }  // namespace test