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

net/quic/core/quic_data_writer_test.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 <cstdint>
 
 #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"
 
 namespace net {
 namespace test {
 namespace {
 
 class QuicDataWriterTest : public ::testing::TestWithParam<Perspective> {};
 
 TEST_P(QuicDataWriterTest, SanityCheckUFloat16Consts) {
@@ skipping 187 matching lines @@
   };
   char big_endian[] = {
       0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
   };
   const int kBufferLength = sizeof(connection_id);
   char buffer[kBufferLength];
   QuicDataWriter writer(kBufferLength, buffer, GetParam());
   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;
   QuicDataReader reader(buffer, kBufferLength, GetParam());
   reader.ReadConnectionId(&read_connection_id);
   EXPECT_EQ(connection_id, read_connection_id);
 }
 
 TEST_P(QuicDataWriterTest, WriteTag) {
   char CHLO[] = {
       'C', 'H', 'L', 'O',
   };
   const int kBufferLength = sizeof(QuicTag);
   char buffer[kBufferLength];
   QuicDataWriter writer(kBufferLength, buffer, GetParam());
   writer.WriteTag(kCHLO);
   test::CompareCharArraysWithHexError("CHLO", buffer, kBufferLength, CHLO,
                                       kBufferLength);
 
   QuicTag read_chlo;
   QuicDataReader reader(buffer, kBufferLength, GetParam());
   reader.ReadTag(&read_chlo);
   EXPECT_EQ(kCHLO, read_chlo);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net