Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/quic_time_test.cc

Index: net/quic/quic_time_test.cc
diff --git a/net/quic/quic_time_test.cc b/net/quic/quic_time_test.cc
index 602de364583b52158c2863d7ce38fc71f3656a85..9bdba53ffd72f8e2497099e3c3029faad32740c7 100644
--- a/net/quic/quic_time_test.cc
+++ b/net/quic/quic_time_test.cc
@@ -39,22 +39,26 @@ TEST(QuicTimeDeltaTest, FromTo) {
 
 TEST(QuicTimeDeltaTest, Add) {
   EXPECT_EQ(QuicTime::Delta::FromMicroseconds(2000),
-            QuicTime::Delta::Zero().Add(QuicTime::Delta::FromMilliseconds(2)));
+            QuicTime::Delta::Zero() + QuicTime::Delta::FromMilliseconds(2));
 }
 
 TEST(QuicTimeDeltaTest, Subtract) {
   EXPECT_EQ(QuicTime::Delta::FromMicroseconds(1000),
-            QuicTime::Delta::FromMilliseconds(2).Subtract(
-                QuicTime::Delta::FromMilliseconds(1)));
+            QuicTime::Delta::FromMilliseconds(2) -
+                QuicTime::Delta::FromMilliseconds(1));
 }
 
 TEST(QuicTimeDeltaTest, Multiply) {
   int i = 2;
   EXPECT_EQ(QuicTime::Delta::FromMicroseconds(4000),
-            QuicTime::Delta::FromMilliseconds(2).Multiply(i));
+            QuicTime::Delta::FromMilliseconds(2) * i);
+  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(4000),
+            i * QuicTime::Delta::FromMilliseconds(2));
   double d = 2;
   EXPECT_EQ(QuicTime::Delta::FromMicroseconds(4000),
-            QuicTime::Delta::FromMilliseconds(2).Multiply(d));
+            QuicTime::Delta::FromMilliseconds(2) * d);
+  EXPECT_EQ(QuicTime::Delta::FromMicroseconds(4000),
+            d * QuicTime::Delta::FromMilliseconds(2));
 }
 
 TEST(QuicTimeDeltaTest, Max) {
@@ -77,16 +81,15 @@ class QuicTimeTest : public ::testing::Test {
 
 TEST_F(QuicTimeTest, Initialized) {
   EXPECT_FALSE(QuicTime::Zero().IsInitialized());
-  EXPECT_TRUE(QuicTime::Zero()
-                  .Add(QuicTime::Delta::FromMicroseconds(1))
+  EXPECT_TRUE((QuicTime::Zero() + QuicTime::Delta::FromMicroseconds(1))
                   .IsInitialized());
 }
 
 TEST_F(QuicTimeTest, Add) {
-  QuicTime time_1 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1));
-  QuicTime time_2 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(2));
+  QuicTime time_1 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(1);
+  QuicTime time_2 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(2);
 
-  QuicTime::Delta diff = time_2.Subtract(time_1);
+  QuicTime::Delta diff = time_2 - time_1;
 
   EXPECT_EQ(QuicTime::Delta::FromMilliseconds(1), diff);
   EXPECT_EQ(1000, diff.ToMicroseconds());
@@ -94,21 +97,21 @@ TEST_F(QuicTimeTest, Add) {
 }
 
 TEST_F(QuicTimeTest, Subtract) {
-  QuicTime time_1 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1));
-  QuicTime time_2 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(2));
+  QuicTime time_1 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(1);
+  QuicTime time_2 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(2);
 
-  EXPECT_EQ(QuicTime::Delta::FromMilliseconds(1), time_2.Subtract(time_1));
+  EXPECT_EQ(QuicTime::Delta::FromMilliseconds(1), time_2 - time_1);
 }
 
 TEST_F(QuicTimeTest, SubtractDelta) {
-  QuicTime time = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(2));
-  EXPECT_EQ(QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1)),
-            time.Subtract(QuicTime::Delta::FromMilliseconds(1)));
+  QuicTime time = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(2);
+  EXPECT_EQ(QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(1),
+            time - QuicTime::Delta::FromMilliseconds(1));
 }
 
 TEST_F(QuicTimeTest, Max) {
-  QuicTime time_1 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(1));
-  QuicTime time_2 = QuicTime::Zero().Add(QuicTime::Delta::FromMilliseconds(2));
+  QuicTime time_1 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(1);
+  QuicTime time_2 = QuicTime::Zero() + QuicTime::Delta::FromMilliseconds(2);
 
   EXPECT_EQ(time_2, QuicTime::Max(time_1, time_2));
 }
@@ -117,7 +120,7 @@ TEST_F(QuicTimeTest, MockClock) {
   clock_.AdvanceTime(QuicTime::Delta::FromMilliseconds(1));
 
   QuicTime now = clock_.ApproximateNow();
-  QuicTime time = QuicTime::Zero().Add(QuicTime::Delta::FromMicroseconds(1000));
+  QuicTime time = QuicTime::Zero() + QuicTime::Delta::FromMicroseconds(1000);
 
   EXPECT_EQ(now, time);
 
@@ -126,13 +129,13 @@ TEST_F(QuicTimeTest, MockClock) {
 
   EXPECT_NE(now, time);
 
-  time = time.Add(QuicTime::Delta::FromMilliseconds(1));
+  time = time + QuicTime::Delta::FromMilliseconds(1);
   EXPECT_EQ(now, time);
 }
 
 TEST_F(QuicTimeTest, LE) {
   const QuicTime zero = QuicTime::Zero();
-  const QuicTime one = zero.Add(QuicTime::Delta::FromSeconds(1));
+  const QuicTime one = zero + QuicTime::Delta::FromSeconds(1);
   EXPECT_TRUE(zero <= zero);
   EXPECT_TRUE(zero <= one);
   EXPECT_TRUE(one <= one);