Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/quic/core/quic_utils_test.cc

 // Copyright (c) 2013 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/core/quic_utils.h"
 
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/quic_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 85 matching lines @@
             QuicUtils::DetermineAddressChangeType(old_address, new_address));
 
   ASSERT_TRUE(address.AssignFromIPLiteral(kIPv4String1));
   old_address = IPEndPoint(address, 1234);
   ASSERT_TRUE(address.AssignFromIPLiteral(kIPv4String2));
   new_address = IPEndPoint(address, 1234);
   EXPECT_EQ(IPV4_SUBNET_CHANGE,
             QuicUtils::DetermineAddressChangeType(old_address, new_address));
   ASSERT_TRUE(address.AssignFromIPLiteral(kIPv4String3));
   new_address = IPEndPoint(address, 1234);
-  EXPECT_EQ(UNSPECIFIED_CHANGE,
+  EXPECT_EQ(IPV4_TO_IPV4_CHANGE,
             QuicUtils::DetermineAddressChangeType(old_address, new_address));
 }
 
 uint128 IncrementalHashReference(const void* data, size_t len) {
   // The two constants are defined as part of the hash algorithm.
   // see http://www.isthe.com/chongo/tech/comp/fnv/
   // hash = 144066263297769815596495629667062367629
   uint128 hash =
       uint128(UINT64_C(7809847782465536322), UINT64_C(7113472399480571277));
   // kPrime = 309485009821345068724781371
@@ skipping 33 matching lines @@
       "0x0010:  7320 7374 7269 6e67 2073 686f 756c 6420  s.string.should.\n"
       "0x0020:  6265 206c 6f6e 6720 656e 6f75 6768 2074  be.long.enough.t\n"
       "0x0030:  6f20 7370 616e 206d 756c 7469 706c 6520  o.span.multiple.\n"
       "0x0040:  6c69 6e65 7320 6f66 206f 7574 7075 742e  lines.of.output.\n"
       "0x0050:  0102 03                                  ...\n");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net