| Index: net/quic/quic_packet_creator_test.cc
|
| diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
|
| index f5a490d9472cd170eeaab178d98d9a1523968d4a..1480401686edf201b6cd1ca2f0edaa641cde5589 100644
|
| --- a/net/quic/quic_packet_creator_test.cc
|
| +++ b/net/quic/quic_packet_creator_test.cc
|
| @@ -38,25 +38,21 @@ namespace {
|
| struct TestParams {
|
| TestParams(QuicVersion version,
|
| bool version_serialization,
|
| - QuicConnectionIdLength length,
|
| - bool copy_use_prefetch)
|
| + QuicConnectionIdLength length)
|
| : version(version),
|
| connection_id_length(length),
|
| - version_serialization(version_serialization),
|
| - copy_use_prefetch(copy_use_prefetch) {}
|
| + version_serialization(version_serialization) {}
|
|
|
| friend ostream& operator<<(ostream& os, const TestParams& p) {
|
| os << "{ client_version: " << QuicVersionToString(p.version)
|
| << " connection id length: " << p.connection_id_length
|
| - << " include version: " << p.version_serialization
|
| - << " copy use prefetch: " << p.copy_use_prefetch << " }";
|
| + << " include version: " << p.version_serialization << " }";
|
| return os;
|
| }
|
|
|
| QuicVersion version;
|
| QuicConnectionIdLength connection_id_length;
|
| bool version_serialization;
|
| - bool copy_use_prefetch;
|
| };
|
|
|
| // Constructs various test permutations.
|
| @@ -65,16 +61,16 @@ vector<TestParams> GetTestParams() {
|
| QuicConnectionIdLength max = PACKET_8BYTE_CONNECTION_ID;
|
| QuicVersionVector all_supported_versions = QuicSupportedVersions();
|
| for (size_t i = 0; i < all_supported_versions.size(); ++i) {
|
| - params.push_back(TestParams(all_supported_versions[i], true, max, false));
|
| - params.push_back(TestParams(all_supported_versions[i], false, max, false));
|
| + params.push_back(TestParams(all_supported_versions[i], true, max));
|
| + params.push_back(TestParams(all_supported_versions[i], false, max));
|
| }
|
| - params.push_back(TestParams(all_supported_versions[0], true,
|
| - PACKET_0BYTE_CONNECTION_ID, false));
|
| - params.push_back(TestParams(all_supported_versions[0], true,
|
| - PACKET_1BYTE_CONNECTION_ID, false));
|
| - params.push_back(TestParams(all_supported_versions[0], true,
|
| - PACKET_4BYTE_CONNECTION_ID, false));
|
| - params.push_back(TestParams(all_supported_versions[0], true, max, true));
|
| + params.push_back(
|
| + TestParams(all_supported_versions[0], true, PACKET_0BYTE_CONNECTION_ID));
|
| + params.push_back(
|
| + TestParams(all_supported_versions[0], true, PACKET_1BYTE_CONNECTION_ID));
|
| + params.push_back(
|
| + TestParams(all_supported_versions[0], true, PACKET_4BYTE_CONNECTION_ID));
|
| + params.push_back(TestParams(all_supported_versions[0], true, max));
|
| return params;
|
| }
|
|
|
| @@ -130,7 +126,6 @@ class QuicPacketCreatorTest : public ::testing::TestWithParam<TestParams> {
|
| client_framer_.set_visitor(&framer_visitor_);
|
| client_framer_.set_received_entropy_calculator(&entropy_calculator_);
|
| server_framer_.set_visitor(&framer_visitor_);
|
| - FLAGS_quic_packet_creator_prefetch = GetParam().copy_use_prefetch;
|
| }
|
|
|
| ~QuicPacketCreatorTest() override {}
|
|
|