Landing Recent QUIC changes until 3:24 PM, Oct 01, 2016 UTC-4

net/quic/core/quic_multipath_received_packet_manager_test.cc

Index: net/quic/core/quic_multipath_received_packet_manager_test.cc
diff --git a/net/quic/core/quic_multipath_received_packet_manager_test.cc b/net/quic/core/quic_multipath_received_packet_manager_test.cc
index fcb8ed333a1bfe86e9b7f4bf3d2ff702a880d9fc..0dc2e2195d24f5190ddc0e2aa57119bb6ce156c1 100644
--- a/net/quic/core/quic_multipath_received_packet_manager_test.cc
+++ b/net/quic/core/quic_multipath_received_packet_manager_test.cc
@@ -39,7 +39,6 @@ namespace {
 const QuicPathId kPathId1 = 1;
 const QuicPathId kPathId2 = 2;
 const QuicPathId kPathId3 = 3;
-const QuicByteCount kBytes = 1350;
 
 class QuicMultipathReceivedPacketManagerTest : public testing::Test {
  public:
@@ -93,11 +92,11 @@ TEST_F(QuicMultipathReceivedPacketManagerTest, OnPathCreatedAndClosed) {
 }
 
 TEST_F(QuicMultipathReceivedPacketManagerTest, RecordPacketReceived) {
-  EXPECT_CALL(*manager_0_, RecordPacketReceived(_, _, _)).Times(1);
-  multipath_manager_.RecordPacketReceived(kDefaultPathId, kBytes, header_,
+  EXPECT_CALL(*manager_0_, RecordPacketReceived(_, _)).Times(1);
+  multipath_manager_.RecordPacketReceived(kDefaultPathId, header_,
                                           QuicTime::Zero());
-  EXPECT_QUIC_BUG(multipath_manager_.RecordPacketReceived(
-                      kPathId2, kBytes, header_, QuicTime::Zero()),
+  EXPECT_QUIC_BUG(multipath_manager_.RecordPacketReceived(kPathId2, header_,
+                                                          QuicTime::Zero()),
                   "Received a packet on a non-existent path");
 }