Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Side by Side Diff: net/quic/core/quic_sent_packet_manager_test.cc

Issue 2417183003: Remove stl_util's deletion functions from remaining quic code. (Closed)
Patch Set: rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/core/quic_sent_packet_manager.h" 5 #include "net/quic/core/quic_sent_packet_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8
8 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
9 #include "base/stl_util.h"
10 #include "net/quic/core/quic_flags.h" 10 #include "net/quic/core/quic_flags.h"
11 #include "net/quic/test_tools/quic_config_peer.h" 11 #include "net/quic/test_tools/quic_config_peer.h"
12 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h" 12 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
13 #include "net/quic/test_tools/quic_test_utils.h" 13 #include "net/quic/test_tools/quic_test_utils.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using std::vector; 17 using std::vector;
18 using testing::AnyNumber; 18 using testing::AnyNumber;
19 using testing::ElementsAre; 19 using testing::ElementsAre;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 .Times(AnyNumber()); 99 .Times(AnyNumber());
100 EXPECT_CALL(*send_algorithm_, BandwidthEstimate()) 100 EXPECT_CALL(*send_algorithm_, BandwidthEstimate())
101 .Times(AnyNumber()) 101 .Times(AnyNumber())
102 .WillRepeatedly(Return(QuicBandwidth::Zero())); 102 .WillRepeatedly(Return(QuicBandwidth::Zero()));
103 EXPECT_CALL(*send_algorithm_, InSlowStart()).Times(AnyNumber()); 103 EXPECT_CALL(*send_algorithm_, InSlowStart()).Times(AnyNumber());
104 EXPECT_CALL(*send_algorithm_, InRecovery()).Times(AnyNumber()); 104 EXPECT_CALL(*send_algorithm_, InRecovery()).Times(AnyNumber());
105 EXPECT_CALL(*network_change_visitor_, OnPathMtuIncreased(1000)) 105 EXPECT_CALL(*network_change_visitor_, OnPathMtuIncreased(1000))
106 .Times(AnyNumber()); 106 .Times(AnyNumber());
107 } 107 }
108 108
109 ~QuicSentPacketManagerTest() override { base::STLDeleteElements(&packets_); } 109 ~QuicSentPacketManagerTest() override {}
110 110
111 QuicByteCount BytesInFlight() { 111 QuicByteCount BytesInFlight() {
112 return QuicSentPacketManagerPeer::GetBytesInFlight(&manager_); 112 return QuicSentPacketManagerPeer::GetBytesInFlight(&manager_);
113 } 113 }
114 void VerifyUnackedPackets(QuicPacketNumber* packets, size_t num_packets) { 114 void VerifyUnackedPackets(QuicPacketNumber* packets, size_t num_packets) {
115 if (num_packets == 0) { 115 if (num_packets == 0) {
116 EXPECT_FALSE(manager_.HasUnackedPackets()); 116 EXPECT_FALSE(manager_.HasUnackedPackets());
117 EXPECT_EQ(0u, QuicSentPacketManagerPeer::GetNumRetransmittablePackets( 117 EXPECT_EQ(0u, QuicSentPacketManagerPeer::GetNumRetransmittablePackets(
118 &manager_)); 118 &manager_));
119 return; 119 return;
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 QuicAckFrame* frame) { 298 QuicAckFrame* frame) {
299 if (frame->missing) { 299 if (frame->missing) {
300 frame->packets.Add(lower, higher); 300 frame->packets.Add(lower, higher);
301 } else { 301 } else {
302 frame->packets.Remove(lower, higher); 302 frame->packets.Remove(lower, higher);
303 } 303 }
304 } 304 }
305 305
306 QuicFlagSaver flags_; // Save/restore all QUIC flag values. 306 QuicFlagSaver flags_; // Save/restore all QUIC flag values.
307 QuicSentPacketManager manager_; 307 QuicSentPacketManager manager_;
308 vector<QuicEncryptedPacket*> packets_;
309 MockClock clock_; 308 MockClock clock_;
310 QuicConnectionStats stats_; 309 QuicConnectionStats stats_;
311 MockSendAlgorithm* send_algorithm_; 310 MockSendAlgorithm* send_algorithm_;
312 std::unique_ptr<MockNetworkChangeVisitor> network_change_visitor_; 311 std::unique_ptr<MockNetworkChangeVisitor> network_change_visitor_;
313 }; 312 };
314 313
315 INSTANTIATE_TEST_CASE_P(QuicSentPacketManagerTest, 314 INSTANTIATE_TEST_CASE_P(QuicSentPacketManagerTest,
316 QuicSentPacketManagerTest, 315 QuicSentPacketManagerTest,
317 ::testing::ValuesIn(GetTestParams())); 316 ::testing::ValuesIn(GetTestParams()));
318 317
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1734 ExpectAck(1); 1733 ExpectAck(1);
1735 EXPECT_CALL(*network_change_visitor_, 1734 EXPECT_CALL(*network_change_visitor_,
1736 OnPathMtuIncreased(kDefaultLength + 100)); 1735 OnPathMtuIncreased(kDefaultLength + 100));
1737 QuicAckFrame ack_frame = InitAckFrame(1); 1736 QuicAckFrame ack_frame = InitAckFrame(1);
1738 manager_.OnIncomingAck(ack_frame, clock_.Now()); 1737 manager_.OnIncomingAck(ack_frame, clock_.Now());
1739 } 1738 }
1740 1739
1741 } // namespace 1740 } // namespace
1742 } // namespace test 1741 } // namespace test
1743 } // namespace net 1742 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/core/crypto/crypto_server_config_protobuf.cc ('k') | net/quic/core/quic_unacked_packet_map_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698