commit 52c8f33c15f4e3b9d681804a4e3b8fc6d9b4b090
author dschinazi <dschinazi@google.com> Mon Aug 17 13:30:01 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 17 13:30:43 2020 -0700
tree d104265fa844bb898c252b058287e1144ea9abac
parent 5c6834b7678f2d5d8ff90c790f909efc845c9b22

Deprecate quic_google_transport_param_omit_old

Deprecate gfe2_restart_flag_quic_google_transport_param_omit_old

PiperOrigin-RevId: 327087161
Change-Id: I10cd15ce6ad6e59d230198fbf10c805ec4fc9361

quic/core/tls_server_handshaker.cc

diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index e8024e0..66d8cc3 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -303,16 +303,9 @@
     return false;
   }
   ProcessAdditionalTransportParameters(client_params);
-  if (!session()->user_agent_id().has_value()) {
-    if (client_params.user_agent_id.has_value()) {
-      session()->SetUserAgentId(client_params.user_agent_id.value());
-    } else if (client_params.google_quic_params) {
-      quiche::QuicheStringPiece user_agent_id;
-      client_params.google_quic_params->GetStringPiece(kUAID, &user_agent_id);
-      if (!user_agent_id.empty()) {
-        session()->SetUserAgentId(user_agent_id.data());
-      }
-    }
+  if (!session()->user_agent_id().has_value() &&
+      client_params.user_agent_id.has_value()) {
+    session()->SetUserAgentId(client_params.user_agent_id.value());
   }
 
   return true;