commit 7057ffdb5ee70b450845f948b58bbff8df336157
author bnc <bnc@google.com> Mon May 23 10:04:56 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 23 10:06:48 2022 -0700
tree 6665e51272eec6787111e59b3e19f0e1b68e1fa7
parent 10e69c03ee8d31f963fce284998859f7650a5fd5

Deprecate --gfe2_reloadable_flag_balsa_search_beyond_null.

PiperOrigin-RevId: 450465205

quiche/balsa/balsa_headers.cc

diff --git a/quiche/balsa/balsa_headers.cc b/quiche/balsa/balsa_headers.cc
index 1ceee58..933d631 100644
--- a/quiche/balsa/balsa_headers.cc
+++ b/quiche/balsa/balsa_headers.cc
@@ -788,13 +788,10 @@
       bool found = absl::StartsWith(values, needle);
 
       // Find the entirety of this value (including trailing comma if existent).
-      bool comma_found = false;
-      size_t cur_size = 0;
-
-        const size_t next_comma =
-            values.find(',', /* pos = */ found ? needle.size() : 0);
-        comma_found = next_comma != absl::string_view::npos;
-        cur_size = (comma_found ? next_comma + 1 : values.size());
+      const size_t next_comma =
+          values.find(',', /* pos = */ (found ? needle.size() : 0));
+      const bool comma_found = next_comma != absl::string_view::npos;
+      const size_t cur_size = (comma_found ? next_comma + 1 : values.size());
 
       // Make sure that our prefix match is a full match.
       if (found && cur_size != needle.size()) {

quiche/balsa/balsa_headers_test.cc

diff --git a/quiche/balsa/balsa_headers_test.cc b/quiche/balsa/balsa_headers_test.cc
index 3663e9d..35d1ecb 100644
--- a/quiche/balsa/balsa_headers_test.cc
+++ b/quiche/balsa/balsa_headers_test.cc
@@ -837,11 +837,11 @@
       EXPECT_TRUE(headers.HeaderHasValue(key, value2));
       EXPECT_EQ(value, headers.GetAllOfHeaderAsString(key));
 
-        EXPECT_EQ(1u, headers.RemoveValue(key, value2));
+      EXPECT_EQ(1u, headers.RemoveValue(key, value2));
 
-        EXPECT_TRUE(headers.HeaderHasValue(key, value1));
-        EXPECT_FALSE(headers.HeaderHasValue(key, value2));
-        EXPECT_EQ(value1, headers.GetAllOfHeaderAsString(key));
+      EXPECT_TRUE(headers.HeaderHasValue(key, value1));
+      EXPECT_FALSE(headers.HeaderHasValue(key, value2));
+      EXPECT_EQ(value1, headers.GetAllOfHeaderAsString(key));
     }
 
     {