commit 0b2b3412af680a8c2bc0968d85f857c26257b896
author vasilvv <vasilvv@google.com> Thu Jun 02 15:46:15 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 02 15:47:21 2022 -0700
tree f612c89a816220de7a086d665610683ac5325600
parent ac2e30d78ad5e84f40acf6b0c287b8cc7678877c

Disable EXPECT/ASSERT overrides and re-enable header modules

Since we no longer use -Wsign-compare in Chromium <https://chromium-review.googlesource.com/c/chromium/src/+/3669880>, those are no longer necessary.

PiperOrigin-RevId: 452639308

quiche/quic/core/quic_bandwidth_test.cc

diff --git a/quiche/quic/core/quic_bandwidth_test.cc b/quiche/quic/core/quic_bandwidth_test.cc
index 5f32f11..2d2f994 100644
--- a/quiche/quic/core/quic_bandwidth_test.cc
+++ b/quiche/quic/core/quic_bandwidth_test.cc
@@ -83,21 +83,21 @@
 }
 
 TEST_F(QuicBandwidthTest, BytesPerPeriod) {
-  EXPECT_EQ(2000u, QuicBandwidth::FromKBytesPerSecond(2000).ToBytesPerPeriod(
-                       QuicTime::Delta::FromMilliseconds(1)));
-  EXPECT_EQ(2u, QuicBandwidth::FromKBytesPerSecond(2000).ToKBytesPerPeriod(
-                    QuicTime::Delta::FromMilliseconds(1)));
-  EXPECT_EQ(200000u, QuicBandwidth::FromKBytesPerSecond(2000).ToBytesPerPeriod(
-                         QuicTime::Delta::FromMilliseconds(100)));
-  EXPECT_EQ(200u, QuicBandwidth::FromKBytesPerSecond(2000).ToKBytesPerPeriod(
-                      QuicTime::Delta::FromMilliseconds(100)));
+  EXPECT_EQ(2000, QuicBandwidth::FromKBytesPerSecond(2000).ToBytesPerPeriod(
+                      QuicTime::Delta::FromMilliseconds(1)));
+  EXPECT_EQ(2, QuicBandwidth::FromKBytesPerSecond(2000).ToKBytesPerPeriod(
+                   QuicTime::Delta::FromMilliseconds(1)));
+  EXPECT_EQ(200000, QuicBandwidth::FromKBytesPerSecond(2000).ToBytesPerPeriod(
+                        QuicTime::Delta::FromMilliseconds(100)));
+  EXPECT_EQ(200, QuicBandwidth::FromKBytesPerSecond(2000).ToKBytesPerPeriod(
+                     QuicTime::Delta::FromMilliseconds(100)));
 
   // 1599 * 1001 = 1600599 bits/ms = 200.074875 bytes/s.
-  EXPECT_EQ(200u, QuicBandwidth::FromBitsPerSecond(1599).ToBytesPerPeriod(
-                      QuicTime::Delta::FromMilliseconds(1001)));
+  EXPECT_EQ(200, QuicBandwidth::FromBitsPerSecond(1599).ToBytesPerPeriod(
+                     QuicTime::Delta::FromMilliseconds(1001)));
 
-  EXPECT_EQ(200u, QuicBandwidth::FromBitsPerSecond(1599).ToKBytesPerPeriod(
-                      QuicTime::Delta::FromSeconds(1001)));
+  EXPECT_EQ(200, QuicBandwidth::FromBitsPerSecond(1599).ToKBytesPerPeriod(
+                     QuicTime::Delta::FromSeconds(1001)));
 }
 
 TEST_F(QuicBandwidthTest, TransferTime) {

quiche/quic/tools/quic_simple_server_stream_test.cc

diff --git a/quiche/quic/tools/quic_simple_server_stream_test.cc b/quiche/quic/tools/quic_simple_server_stream_test.cc
index f06725b..5d9ff15 100644
--- a/quiche/quic/tools/quic_simple_server_stream_test.cc
+++ b/quiche/quic/tools/quic_simple_server_stream_test.cc
@@ -65,7 +65,8 @@
 
   MOCK_METHOD(void, WriteHeadersMock, (bool fin), ());
   MOCK_METHOD(void, WriteEarlyHintsHeadersMock, (bool fin), ());
-  MOCK_METHOD(void, WriteOrBufferBody, (absl::string_view data, bool fin), ());
+  MOCK_METHOD(void, WriteOrBufferBody, (absl::string_view data, bool fin),
+              (override));
 
   size_t WriteHeaders(
       spdy::Http2HeaderBlock header_block, bool fin,