Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/quic_data_writer_test.cc

Index: net/quic/core/quic_data_writer_test.cc
diff --git a/net/quic/core/quic_data_writer_test.cc b/net/quic/core/quic_data_writer_test.cc
index bc1d0ad262cd4891ab251925cd7f2db2f18f71d0..893ff42c2a4d052478e8ea10980ff99f06bb8b92 100644
--- a/net/quic/core/quic_data_writer_test.cc
+++ b/net/quic/core/quic_data_writer_test.cc
@@ -8,6 +8,7 @@
 
 #include "net/quic/core/quic_data_reader.h"
 #include "net/quic/core/quic_flags.h"
+#include "net/quic/core/quic_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -215,8 +216,8 @@ TEST_P(QuicDataWriterTest, WriteConnectionId) {
   writer.WriteConnectionId(connection_id);
   test::CompareCharArraysWithHexError(
       "connection_id", buffer, kBufferLength,
-      FLAGS_quic_restart_flag_quic_big_endian_connection_id ? big_endian
-                                                            : little_endian,
+      QuicUtils::IsConnectionIdWireFormatBigEndian(GetParam()) ? big_endian
+                                                               : little_endian,
       kBufferLength);
 
   uint64_t read_connection_id;