Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_utils.cc

Index: net/quic/core/quic_utils.cc
diff --git a/net/quic/core/quic_utils.cc b/net/quic/core/quic_utils.cc
index f02adfc2094d071f2cfb9c569e184dae522a7192..efc5b5dd3fbc1fe8aeb94fbf6e1b8949194cbc13 100644
--- a/net/quic/core/quic_utils.cc
+++ b/net/quic/core/quic_utils.cc
@@ -251,6 +251,7 @@ const char* QuicUtils::ErrorToString(QuicErrorCode error) {
     RETURN_STRING_LITERAL(QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND);
     RETURN_STRING_LITERAL(QUIC_CRYPTO_MESSAGE_PARAMETER_NO_OVERLAP);
     RETURN_STRING_LITERAL(QUIC_CRYPTO_MESSAGE_INDEX_NOT_FOUND);
+    RETURN_STRING_LITERAL(QUIC_UNSUPPORTED_PROOF_DEMAND);
     RETURN_STRING_LITERAL(QUIC_INVALID_STREAM_ID);
     RETURN_STRING_LITERAL(QUIC_INVALID_PRIORITY);
     RETURN_STRING_LITERAL(QUIC_TOO_MANY_OPEN_STREAMS);
@@ -381,14 +382,6 @@ QuicTagVector QuicUtils::ParseQuicConnectionOptions(
   return options;
 }
 
-string QuicUtils::ListTags(QuicTagValueMap tag_map) {
-  string result;
-  for (auto entry : tag_map) {
-    result.append(TagToString(entry.first) + " ");
-  }
-  return result;
-}
-
 string QuicUtils::PeerAddressChangeTypeToString(PeerAddressChangeType type) {
   switch (type) {
     RETURN_STRING_LITERAL(NO_CHANGE);