Land Recent QUIC changes.

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;
 using std::string;
 
 namespace net {
 namespace test {
 namespace {
 
 // A test string and a hex+ASCII dump of the same string.
@@ skipping 44 matching lines @@
               QuicUtils::StringToHexASCIIDump(StringPiece(tests[i].input)));
   }
 }
 
 TEST(QuicUtilsTest, StringToHexASCIIDumpSuccess) {
   EXPECT_EQ(string(reinterpret_cast<const char*>(kHexDump)),
       QuicUtils::StringToHexASCIIDump(
           string(reinterpret_cast<const char*>(kString), sizeof(kString))));
 }
 
+TEST(QuicUtilsTest, TagToString) {
+  EXPECT_EQ("SCFG",
+            QuicUtils::TagToString(kSCFG));
+  EXPECT_EQ("SNO ",
+            QuicUtils::TagToString(kServerNonceTag));
+  EXPECT_EQ("CRT ",
+            QuicUtils::TagToString(kCertificateTag));
+  EXPECT_EQ("CHLO",
+            QuicUtils::TagToString(MakeQuicTag('C', 'H', 'L', 'O')));
+  // 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')));
+}
+
 }  // namespace
 }  // namespace test
 }  // namespace net