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

Unified Diff: net/quic/chromium/quic_stream_factory_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/chromium/quic_stream_factory.cc ('k') | net/quic/core/crypto/crypto_server_config_protobuf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/chromium/quic_stream_factory_test.cc
diff --git a/net/quic/chromium/quic_stream_factory_test.cc b/net/quic/chromium/quic_stream_factory_test.cc
index 98a3306ea8f45cb884af71843b4d49a7e1f72143..f2a5aded6e2d60f809d51744e08cd55335540fc1 100644
--- a/net/quic/chromium/quic_stream_factory_test.cc
+++ b/net/quic/chromium/quic_stream_factory_test.cc
@@ -4,11 +4,13 @@
#include "net/quic/chromium/quic_stream_factory.h"
+#include <memory>
#include <ostream>
#include <utility>
#include "base/bind.h"
#include "base/callback.h"
+#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -1218,7 +1220,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
socket_data.AddSocketDataToFactory(&socket_factory_);
HttpRequestInfo request_info;
- vector<QuicHttpStream*> streams;
+ vector<std::unique_ptr<QuicHttpStream>> streams;
// The MockCryptoClientStream sets max_open_streams to be
// kDefaultMaxStreamsPerConnection / 2.
for (size_t i = 0; i < kDefaultMaxStreamsPerConnection / 2; i++) {
@@ -1236,7 +1238,7 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
EXPECT_TRUE(stream);
EXPECT_EQ(OK, stream->InitializeStream(&request_info, DEFAULT_PRIORITY,
net_log_, CompletionCallback()));
- streams.push_back(stream.release());
+ streams.push_back(std::move(stream));
}
QuicStreamRequest request(factory_.get());
@@ -1264,8 +1266,6 @@ TEST_P(QuicStreamFactoryTest, MaxOpenStream) {
QuicChromiumClientSession* session = GetActiveSession(host_port_pair_);
session->connection()->CloseConnection(QUIC_PUBLIC_RESET, "test",
ConnectionCloseBehavior::SILENT_CLOSE);
-
- base::STLDeleteElements(&streams);
}
TEST_P(QuicStreamFactoryTest, ResolutionErrorInCreate) {
« no previous file with comments | « net/quic/chromium/quic_stream_factory.cc ('k') | net/quic/core/crypto/crypto_server_config_protobuf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698