Land recent QUIC changes.

net/quic/quic_time_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_time.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
@@ skipping 80 matching lines @@
 
 TEST_F(QuicTimeTest, SubtractDelta) {
   QuicTime time = QuicTime::FromMilliseconds(2);
   EXPECT_EQ(QuicTime::FromMilliseconds(1),
             time.Subtract(QuicTime::Delta::FromMilliseconds(1)));
 }
 
 TEST_F(QuicTimeTest, MockClock) {
   clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(1));
 
-  QuicTime now = clock_.Now();
+  QuicTime now = clock_.ApproximateNow();
   QuicTime time = QuicTime::FromMicroseconds(1000);
 
   EXPECT_EQ(now, time);
 
   clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(1));
-  now = clock_.Now();
+  now = clock_.ApproximateNow();
 
   EXPECT_NE(now, time);
 
   time = time.Add(QuicTime::Delta::FromMilliseconds(1));
   EXPECT_EQ(now, time);
 }
 
 }  // namespace test
 }  // namespace net