Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/core/quic_stream_sequencer.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/core/quic_stream_sequencer.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 42 matching lines @@
       return;
     }
   }
   size_t bytes_written;
   string error_details;
   QuicErrorCode result = buffered_frames_.OnStreamData(
       byte_offset, StringPiece(frame.data_buffer, frame.data_length),
       clock_->ApproximateNow(), &bytes_written, &error_details);
   if (result != QUIC_NO_ERROR) {
     string details = "Stream" + base::Uint64ToString(stream_->id()) + ": " +
-                     QuicUtils::ErrorToString(result) + ": " + error_details +
+                     QuicErrorCodeToString(result) + ": " + error_details +
                      "\nPeer Address: " +
                      stream_->PeerAddressOfLatestPacket().ToString();
-    DLOG(WARNING) << QuicUtils::ErrorToString(result);
+    DLOG(WARNING) << QuicErrorCodeToString(result);
     DLOG(WARNING) << details;
     stream_->CloseConnectionWithDetails(result, details);
     return;
   }
 
   if (bytes_written == 0) {
     ++num_duplicate_frames_received_;
     // Silently ignore duplicates.
     return;
   }
@@ skipping 150 matching lines @@
          "\n  bytes buffered: " + IntToString(NumBytesBuffered()) +
          "\n  bytes consumed: " + IntToString( NumBytesConsumed()) +
          "\n  has bytes to read: " +  (HasBytesToRead() ? "true" : "false") +
          "\n  frames received: " + IntToString(num_frames_received()) +
          "\n  close offset bytes: " + IntToString( close_offset_) +
          "\n  is closed: " + (IsClosed() ? "true" : "false");
   // clang-format on
 }
 
 }  // namespace net