summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/quic/quic_connection_helper_test.cc1
-rw-r--r--net/quic/quic_http_stream_test.cc1
-rw-r--r--tools/valgrind/memcheck/suppressions.txt25
3 files changed, 2 insertions, 25 deletions
diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc
index d3d97e5..f62fa4a 100644
--- a/net/quic/quic_connection_helper_test.cc
+++ b/net/quic/quic_connection_helper_test.cc
@@ -131,6 +131,7 @@ class QuicConnectionHelperTest : public ::testing::Test {
QuicBandwidth::FromKBitsPerSecond(100)));
EXPECT_CALL(*send_algorithm_, SmoothedRtt()).WillRepeatedly(Return(
QuicTime::Delta::FromMilliseconds(100)));
+ EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)).Times(AnyNumber());
ON_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))
.WillByDefault(Return(true));
EXPECT_CALL(visitor_, HasPendingHandshake()).Times(AnyNumber());
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index e3f3fd5..7100b20 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -198,6 +198,7 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<bool> {
Return(QuicTime::Delta::Zero()));
EXPECT_CALL(*send_algorithm_, BandwidthEstimate()).WillRepeatedly(
Return(QuicBandwidth::Zero()));
+ EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)).Times(AnyNumber());
helper_.reset(new QuicConnectionHelper(runner_.get(), &clock_,
&random_generator_));
writer_.reset(new QuicDefaultPacketWriter(socket));
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index ba5e994..97b8441 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -6448,28 +6448,3 @@
fun:_Znw*
fun:_ZN8app_list32AppListModelTest_FolderItem_Test8TestBodyEv
}
-{
- bug_313738
- Memcheck:Uninitialized
- ...
- fun:snprintf
- fun:_ZN7testing12_GLOBAL__N_126PrintByteSegmentInObjectToEPKhmmPSo
- fun:_ZN7testing12_GLOBAL__N_124PrintBytesInObjectToImplEPKhmPSo
- fun:_ZN7testing9internal220PrintBytesInObjectToEPKhmPSo
- fun:_ZN7testing9internal220TypeWithoutFormatterIN3net10QuicConfigELNS0_8TypeKindE2EE10PrintValueERKS3_PSo
- fun:_ZN7testing9internal2lsIcSt11char_traitsIcEN3net10QuicConfigEEERSt13basic_ostreamIT_T0_ESA_RKT1_
- fun:_ZN16testing_internal26DefaultPrintNonContainerToIN3net10QuicConfigEEEvRKT_PSo
- fun:_ZN7testing8internal14DefaultPrintToIN3net10QuicConfigEEEvcNS0_13bool_constantILb0EEERKT_PSo
- fun:_ZN7testing8internal7PrintToIN3net10QuicConfigEEEvRKT_PSo
- fun:_ZN7testing8internal16UniversalPrinterIN3net10QuicConfigEE5PrintERKS3_PSo
- fun:_ZN7testing8internal14UniversalPrintIN3net10QuicConfigEEEvRKT_PSo
- fun:_ZN7testing8internal16UniversalPrinterIRKN3net10QuicConfigEE5PrintES5_PSo
- fun:_ZN7testing8internal18TuplePrefixPrinterILm1EE13PrintPrefixToINSt3tr15tupleIRKN3net10QuicConfigEbNS4_10_NullClassESA_SA_SA_SA_SA_SA_SA_EEEEvRKT_PSo
- fun:_ZN7testing8internal18TuplePrefixPrinterILm2EE13PrintPrefixToINSt3tr15tupleIRKN3net10QuicConfigEbNS4_10_NullClassESA_SA_SA_SA_SA_SA_SA_EEEEvRKT_PSo
- fun:_ZN7testing8internal12PrintTupleToINSt3tr15tupleIRKN3net10QuicConfigEbNS2_10_NullClassES8_S8_S8_S8_S8_S8_S8_EEEEvRKT_PSo
- fun:_ZN7testing8internal7PrintToIRKN3net10QuicConfigEbEEvRKNSt3tr15tupleIT_T0_NS6_10_NullClassESA_SA_SA_SA_SA_SA_SA_EEPSo
- fun:_ZN7testing8internal16UniversalPrinterINSt3tr15tupleIRKN3net10QuicConfigEbNS2_10_NullClassES8_S8_S8_S8_S8_S8_S8_EEE5PrintERKS9_PSo
- fun:_ZN7testing8internal14UniversalPrintINSt3tr15tupleIRKN3net10QuicConfigEbNS2_10_NullClassES8_S8_S8_S8_S8_S8_S8_EEEEvRKT_PSo
- fun:_ZNK7testing8internal18FunctionMockerBaseIFvRKN3net10QuicConfigEbEE32UntypedDescribeUninterestingCallEPKvPSo
- fun:_ZN7testing8internal25UntypedFunctionMockerBase17UntypedInvokeWithEPKv
-}