Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_data_reader.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_data_reader.h"
 
 #include "net/base/int128.h"
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
 #include "net/quic/platform/api/quic_endian.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_logging.h"
 
 namespace net {
 
 #define ENDPOINT \
   (perspective_ == Perspective::IS_SERVER ? "Server: " : "Client: ")
 
 QuicDataReader::QuicDataReader(const char* data,
                                const size_t len,
                                Perspective perspective)
@@ skipping 136 matching lines @@
 uint8_t QuicDataReader::PeekByte() const {
   if (pos_ >= len_) {
     QUIC_BUG << "Reading is done, cannot peek next byte. Tried to read pos = "
              << pos_ << " buffer length = " << len_;
     return 0;
   }
   return data_[pos_];
 }
 
 }  // namespace net