Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_data_writer.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_writer.h"
 
 #include <algorithm>
 #include <limits>
 
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_utils.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: ")
 
 QuicDataWriter::QuicDataWriter(size_t size,
                                char* buffer,
                                Perspective perspective)
@@ skipping 137 matching lines @@
   }
 
   return WriteUInt64(connection_id);
 }
 
 bool QuicDataWriter::WriteTag(uint32_t tag) {
   return WriteBytes(&tag, sizeof(tag));
 }
 
 }  // namespace net