Fix more signed-unsigned comparisons in QUICHE.
This is in preparation for landing some macro magic that would actually enforce
it in test comparison macros.
In some places I fixed the issue by adding 'u' to an integer literal. In other
places I chose the path of least resistance and modified the build rule. This
is okay for files that are not included in Chromium and for which there are no
immediate plans to include them. In the long term we might change the Chromium
build rules for QUICHE in which case this all becomes moot. Or if we don't, it
is obvious that there are violations in the given file, and they can be fixed
and the build rule change reverted before including them in the Chromium build.
The important part is to make sure currently included files cannot be modified
in a -Wsign-compare violating way, so as not to block QUICHE merge.
PiperOrigin-RevId: 389891302
diff --git a/spdy/core/metadata_extension_test.cc b/spdy/core/metadata_extension_test.cc
index 07a5ee1..7538c31 100644
--- a/spdy/core/metadata_extension_test.cc
+++ b/spdy/core/metadata_extension_test.cc
@@ -106,7 +106,7 @@
ASSERT_TRUE(frame != nullptr);
while (frame != nullptr) {
const size_t frame_size = framer.SerializeFrame(*frame, &test_buffer_);
- ASSERT_GT(frame_size, 0);
+ ASSERT_GT(frame_size, 0u);
ASSERT_FALSE(deframer.HasError());
ASSERT_EQ(frame_size, test_buffer_.Size());
EXPECT_EQ(frame_size, deframer.ProcessInput(kBuffer, frame_size));
@@ -151,14 +151,14 @@
ASSERT_TRUE(frame != nullptr);
while (frame != nullptr) {
const size_t frame_size = framer.SerializeFrame(*frame, &test_buffer_);
- ASSERT_GT(frame_size, 0);
+ ASSERT_GT(frame_size, 0u);
ASSERT_FALSE(deframer.HasError());
ASSERT_EQ(frame_size, test_buffer_.Size());
EXPECT_EQ(frame_size, deframer.ProcessInput(kBuffer, frame_size));
test_buffer_.Reset();
frame = sequence->Next();
}
- EXPECT_EQ(1, received_count_);
+ EXPECT_EQ(1u, received_count_);
auto it = received_payload_map_.find(3);
ASSERT_TRUE(it != received_payload_map_.end());
EXPECT_EQ(payload_block, it->second);
@@ -201,7 +201,7 @@
for (auto frame : {frame1.get(), frame2.get()}) {
if (frame != nullptr) {
const size_t frame_size = framer.SerializeFrame(*frame, &test_buffer_);
- ASSERT_GT(frame_size, 0);
+ ASSERT_GT(frame_size, 0u);
ASSERT_FALSE(deframer.HasError());
ASSERT_EQ(frame_size, test_buffer_.Size());
EXPECT_EQ(frame_size, deframer.ProcessInput(kBuffer, frame_size));
@@ -211,7 +211,7 @@
frame1 = sequence1->Next();
frame2 = sequence2->Next();
}
- EXPECT_EQ(2, received_count_);
+ EXPECT_EQ(2u, received_count_);
auto it = received_payload_map_.find(3);
ASSERT_TRUE(it != received_payload_map_.end());
EXPECT_EQ(payload1, it->second);
