Land Recent QUIC Changes until 05/13/2015

net/quic/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/quic_utils.h"
 
 #include "net/quic/crypto/crypto_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
@@ skipping 70 matching lines @@
   // A tag that contains a non-printing character will be printed as a decimal
   // number.
   EXPECT_EQ("525092931",
             QuicUtils::TagToString(MakeQuicTag('C', 'H', 'L', '\x1f')));
 }
 
 TEST(QuicUtilsTest, ParseQuicConnectionOptions) {
   QuicTagVector empty_options = QuicUtils::ParseQuicConnectionOptions("");
   EXPECT_EQ(0ul, empty_options.size());
 
-  QuicTagVector parsed_options = QuicUtils::ParseQuicConnectionOptions(
-      "PACE,TIMER,TBBR,REJ");
+  QuicTagVector parsed_options =
+      QuicUtils::ParseQuicConnectionOptions("TIMER,TBBR,REJ");
   QuicTagVector expected_options;
-  expected_options.push_back(kPACE);
   expected_options.push_back(kTIME);
   expected_options.push_back(kTBBR);
   expected_options.push_back(kREJ);
   EXPECT_EQ(expected_options, parsed_options);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net