Land Recent QUIC changes.

net/quic/quic_utils_test.cc

Index: net/quic/quic_utils_test.cc
diff --git a/net/quic/quic_utils_test.cc b/net/quic/quic_utils_test.cc
index 0e50aec0ec1dd36e247cd7f87d1e97afd27db8b7..0a0355f7d25df05e116580204f321cf68daad7d6 100644
--- a/net/quic/quic_utils_test.cc
+++ b/net/quic/quic_utils_test.cc
@@ -4,6 +4,7 @@
 
 #include "net/quic/quic_utils.h"
 
+#include "net/quic/crypto/crypto_protocol.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
@@ -68,6 +69,21 @@ TEST(QuicUtilsTest, StringToHexASCIIDumpSuccess) {
           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