Landing Recent QUIC changes until Thu Mar 16 17:24:53 2017 +0000

net/quic/core/quic_data_reader.cc

Index: net/quic/core/quic_data_reader.cc
diff --git a/net/quic/core/quic_data_reader.cc b/net/quic/core/quic_data_reader.cc
index ea078de6a5f85382cf74a286a0a1aa16c0f10a62..c34034df54269ed2bb426e78ce80b8f6dddda3e2 100644
--- a/net/quic/core/quic_data_reader.cc
+++ b/net/quic/core/quic_data_reader.cc
@@ -5,7 +5,9 @@
 #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/platform/api/quic_endian.h"
 
 namespace net {
 
@@ -84,6 +86,18 @@ bool QuicDataReader::ReadStringPiece(QuicStringPiece* result, size_t size) {
   return true;
 }
 
+bool QuicDataReader::ReadConnectionId(uint64_t* connection_id) {
+  if (!ReadUInt64(connection_id)) {
+    return false;
+  }
+
+  if (FLAGS_quic_restart_flag_quic_big_endian_connection_id) {
+    *connection_id = QuicEndian::NetToHost64(*connection_id);
+  }
+
+  return true;
+}
+
 QuicStringPiece QuicDataReader::ReadRemainingPayload() {
   QuicStringPiece payload = PeekRemainingPayload();
   pos_ = len_;