Land Recent QUIC changes.

net/quic/quic_utils.cc

 // Copyright (c) 2012 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 <ctype.h>
 
 #include <algorithm>
 
@@ skipping 212 matching lines @@
 }
 
 // static
 string QuicUtils::TagToString(QuicTag tag) {
   char chars[4];
   bool ascii = true;
   const QuicTag orig_tag = tag;
 
   for (size_t i = 0; i < sizeof(chars); i++) {
     chars[i] = tag;
-    if (chars[i] == 0 && i == 3) {
+    if ((chars[i] == 0 || chars[i] == '\xff') && i == 3) {
       chars[i] = ' ';
     }
     if (!isprint(static_cast<unsigned char>(chars[i]))) {
       ascii = false;
       break;
     }
     tag >>= 8;
   }
 
   if (ascii) {
@@ skipping 29 matching lines @@
 
     bytes_remaining -= line_bytes;
     offset += line_bytes;
     p += line_bytes;
     s += '\n';
   }
   return s;
 }
 
 }  // namespace net