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

net/quic/quic_protocol_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_protocol.h"
 
 #include <sstream>
 
 #include "base/stl_util.h"
 #include "net/quic/quic_flags.h"
@@ skipping 171 matching lines @@
 }
 
 TEST(QuicProtocolTest, AckFrameToString) {
   QuicAckFrame frame;
   frame.entropy_hash = 1;
   frame.largest_observed = 2;
   frame.ack_delay_time = QuicTime::Delta::FromMicroseconds(3);
   frame.packets.Add(4);
   frame.packets.Add(5);
   frame.received_packet_times = {
-      {6, QuicTime::Zero().Add(QuicTime::Delta::FromMicroseconds(7))}};
+      {6, QuicTime::Zero() + QuicTime::Delta::FromMicroseconds(7)}};
   std::ostringstream stream;
   stream << frame;
   EXPECT_EQ(
       "{ entropy_hash: 1, largest_observed: 2, ack_delay_time: 3, "
       "packets: [ 4 5  ], is_truncated: 0, received_packets: [ 6 at 7  ] }\n",
       stream.str());
 }
 
 TEST(QuicProtocolTest, PaddingFrameToString) {
   QuicPaddingFrame frame;
@@ skipping 193 matching lines @@
   EXPECT_EQ(10u, queue.LastIntervalLength());
   queue.Remove(9, 21);
   EXPECT_EQ(3u, queue.NumIntervals());
   EXPECT_FALSE(queue.Contains(9));
   EXPECT_FALSE(queue.Contains(20));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net