Deprecate quic_remove_android_conformance_test_workaround

Deprecate gfe2_reloadable_flag_quic_remove_android_conformance_test_workaround

PiperOrigin-RevId: 314188945
Change-Id: I4f779b61976141a77056ad04286bfb4362a7f1a4

quic/core/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index 80e8a78..d26431d 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -592,36 +592,6 @@
 QuicDispatcher::QuicPacketFate QuicDispatcher::ValidityChecks(
     const ReceivedPacketInfo& packet_info) {
   if (!packet_info.version_flag) {
-    // The Android network conformance test contains a UDP test that sends a
-    // 12-byte packet with the following format:
-    //  - 0x0c (public flags: 8-byte connection ID, 1-byte packet number)
-    //  - randomized 8-byte connection ID
-    //  - 0x01 (1-byte packet number)
-    //  - 0x00 (private flags)
-    //  - 0x07 (PING frame).
-    // That packet is invalid and we would normally drop it but in order to
-    // unblock this conformance testing we have the following workaround that
-    // will be removed once the fixed test is deployed.
-    // TODO(b/139691956) Remove this workaround once fixed test is deployed.
-    if (!GetQuicReloadableFlag(
-            quic_remove_android_conformance_test_workaround) &&
-        packet_info.packet.length() == 12 &&
-        packet_info.packet.data()[0] == 0x0c &&
-        packet_info.packet.data()[9] == 0x01 &&
-        packet_info.packet.data()[10] == 0x00 &&
-        packet_info.packet.data()[11] == 0x07) {
-      QUIC_DLOG(INFO) << "Received Android UDP network conformance test "
-                         "packet with connection ID "
-                      << packet_info.destination_connection_id;
-      // Respond with a public reset that the test will know how to parse
-      // then return kFateDrop to stop processing of this packet.
-      time_wait_list_manager()->SendPublicReset(
-          packet_info.self_address, packet_info.peer_address,
-          packet_info.destination_connection_id,
-          /*ietf_quic=*/false, GetPerPacketContext());
-      return kFateDrop;
-    }
-
     QUIC_DLOG(INFO)
         << "Packet without version arrived for unknown connection ID "
         << packet_info.destination_connection_id;

quic/core/quic_dispatcher_test.cc

diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index b1fbbab..8f5fd33 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -1244,55 +1244,6 @@
       destination_connection_id_bytes, sizeof(destination_connection_id_bytes));
 }
 
-TEST_P(QuicDispatcherTestOneVersion, AndroidConformanceTestOld) {
-  if (GetQuicReloadableFlag(quic_remove_android_conformance_test_workaround)) {
-    // TODO(b/139691956) Remove this test once the flag is deprecated.
-    return;
-  }
-  SavingWriter* saving_writer = new SavingWriter();
-  // dispatcher_ takes ownership of saving_writer.
-  QuicDispatcherPeer::UseWriter(dispatcher_.get(), saving_writer);
-
-  QuicTimeWaitListManager* time_wait_list_manager = new QuicTimeWaitListManager(
-      saving_writer, dispatcher_.get(), mock_helper_.GetClock(),
-      &mock_alarm_factory_);
-  // dispatcher_ takes ownership of time_wait_list_manager.
-  QuicDispatcherPeer::SetTimeWaitListManager(dispatcher_.get(),
-                                             time_wait_list_manager);
-  // clang-format off
-  static const unsigned char packet[] = {
-    // Android UDP network conformance test packet as it was before this change:
-    // https://android-review.googlesource.com/c/platform/cts/+/1104285
-    0x0c,  // public flags: 8-byte connection ID, 1-byte packet number
-    0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,  // 8-byte connection ID
-    0x01,  // 1-byte packet number
-    0x00,  // private flags
-    0x07,  // PING frame
-  };
-  // clang-format on
-
-  QuicEncryptedPacket encrypted(reinterpret_cast<const char*>(packet),
-                                sizeof(packet), false);
-  std::unique_ptr<QuicReceivedPacket> received_packet(
-      ConstructReceivedPacket(encrypted, mock_helper_.GetClock()->Now()));
-  EXPECT_CALL(*dispatcher_, CreateQuicSession(_, _, _, _)).Times(0);
-
-  QuicSocketAddress client_address(QuicIpAddress::Loopback4(), 1);
-  dispatcher_->ProcessPacket(server_address_, client_address, *received_packet);
-  ASSERT_EQ(1u, saving_writer->packets()->size());
-
-  // The Android UDP network conformance test directly checks that bytes 1-9
-  // of the response match the connection ID that was sent.
-  static const char connection_id_bytes[] = {0x71, 0x72, 0x73, 0x74,
-                                             0x75, 0x76, 0x77, 0x78};
-  ASSERT_GE((*(saving_writer->packets()))[0]->length(),
-            1u + sizeof(connection_id_bytes));
-  quiche::test::CompareCharArraysWithHexError(
-      "response connection ID", &(*(saving_writer->packets()))[0]->data()[1],
-      sizeof(connection_id_bytes), connection_id_bytes,
-      sizeof(connection_id_bytes));
-}
-
 TEST_P(QuicDispatcherTestOneVersion, AndroidConformanceTest) {
   // WARNING: do not remove or modify this test without making sure that we
   // still have adequate coverage for the Android conformance test.