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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 2904643002: Remove some naked |new| statements in favor of MakeUnique. (Closed)
Patch Set: Revert changes in one test where it caused a crash. Created 3 years, 7 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
« net/http/http_network_transaction.cc ('K') | « net/http/http_stream_factory_impl_request_unittest.cc ('k') | net/url_request/url_request_http_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_unittest.cc
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index d0432931b16f74768a2746c1dde3b200d1924fbb..f7dc841f150bf1b9661ccaf5058de51f20a3a42e 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -502,8 +502,7 @@ TEST_F(HttpStreamFactoryTest, PreconnectDirect) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool);
peer.SetClientSocketPoolManager(std::move(mock_pool_manager));
@@ -535,8 +534,7 @@ TEST_F(HttpStreamFactoryTest, PreconnectHttpProxy) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetSocketPoolForHTTPProxy(
proxy_host, base::WrapUnique(http_proxy_pool));
mock_pool_manager->SetSocketPoolForSSLWithProxy(
@@ -570,8 +568,7 @@ TEST_F(HttpStreamFactoryTest, PreconnectSocksProxy) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetSocketPoolForSOCKSProxy(
proxy_host, base::WrapUnique(socks_proxy_pool));
mock_pool_manager->SetSocketPoolForSSLWithProxy(
@@ -610,8 +607,7 @@ TEST_F(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool);
peer.SetClientSocketPoolManager(std::move(mock_pool_manager));
@@ -641,8 +637,7 @@ TEST_F(HttpStreamFactoryTest, PreconnectUnsafePort) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
peer.SetClientSocketPoolManager(std::move(mock_pool_manager));
@@ -739,7 +734,7 @@ TEST_F(HttpStreamFactoryTest, QuicProxyMarkedAsBad) {
params.ssl_config_service = ssl_config_service.get();
params.http_server_properties = &http_server_properties;
- std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
session->quic_stream_factory()->set_require_confirmation(false);
StaticSocketDataProvider socket_data1;
@@ -829,8 +824,8 @@ class MockQuicData {
void AddSocketDataToFactory(MockClientSocketFactory* factory) {
MockRead* reads = reads_.empty() ? nullptr : &reads_[0];
MockWrite* writes = writes_.empty() ? nullptr : &writes_[0];
- socket_data_.reset(
- new SequencedSocketData(reads, reads_.size(), writes, writes_.size()));
+ socket_data_ = base::MakeUnique<SequencedSocketData>(
+ reads, reads_.size(), writes, writes_.size());
factory->AddSocketDataProvider(socket_data_.get());
}
@@ -906,8 +901,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyMarkedAsBad) {
&ct_verifier, ssl_config_service.get(), &host_resolver,
&transport_security_state, set_alternative_proxy_server);
- std::unique_ptr<HttpNetworkSession> session(
- new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
// Before starting the test, verify that there are no proxies marked as
// bad.
@@ -1027,7 +1021,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyNotMarkedAsBad) {
&transport_security_state, true);
HostPortPair host_port_pair("badproxy", 99);
- std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
// Before starting the test, verify that there are no proxies marked as
// bad.
@@ -1124,7 +1118,7 @@ TEST_F(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
params.enable_quic = true;
params.http_server_properties = &http_server_properties;
- std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
HttpNetworkSessionPeer peer(session.get());
HostPortPair proxy_host("http_proxy", 80);
CapturePreconnectsHttpProxySocketPool* http_proxy_pool =
@@ -1139,8 +1133,7 @@ TEST_F(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {
session_deps.transport_security_state.get(),
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetSocketPoolForHTTPProxy(
proxy_host, base::WrapUnique(http_proxy_pool));
mock_pool_manager->SetSocketPoolForSSLWithProxy(
@@ -1175,8 +1168,7 @@ TEST_F(HttpStreamFactoryTest, OnlyOnePreconnectToProxyServer) {
params.proxy_service = proxy_service.get();
params.http_server_properties = &http_server_properties;
- std::unique_ptr<HttpNetworkSession> session(
- new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
HttpNetworkSessionPeer peer(session.get());
HostPortPair proxy_host("myproxy.org", 443);
@@ -1198,8 +1190,8 @@ TEST_F(HttpStreamFactoryTest, OnlyOnePreconnectToProxyServer) {
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager =
+ base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetSocketPoolForHTTPProxy(
proxy_host, base::WrapUnique(http_proxy_pool));
mock_pool_manager->SetSocketPoolForSSLWithProxy(
@@ -1264,7 +1256,7 @@ TEST_F(HttpStreamFactoryTest, ProxyServerPreconnectDifferentPrivacyModes) {
params.proxy_service = proxy_service.get();
params.http_server_properties = &http_server_properties;
- std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+ auto session = base::MakeUnique<HttpNetworkSession>(params);
HttpNetworkSessionPeer peer(session.get());
HostPortPair proxy_host("myproxy.org", 443);
@@ -1282,8 +1274,7 @@ TEST_F(HttpStreamFactoryTest, ProxyServerPreconnectDifferentPrivacyModes) {
session_deps.cert_transparency_verifier.get(),
session_deps.ct_policy_enforcer.get());
- std::unique_ptr<MockClientSocketPoolManager> mock_pool_manager(
- new MockClientSocketPoolManager);
+ auto mock_pool_manager = base::MakeUnique<MockClientSocketPoolManager>();
mock_pool_manager->SetSocketPoolForHTTPProxy(
proxy_host, base::WrapUnique(http_proxy_pool));
mock_pool_manager->SetSocketPoolForSSLWithProxy(
@@ -1680,8 +1671,7 @@ TEST_F(HttpStreamFactoryTest, RequestHttpStreamOverProxyWithPreconnects) {
ProxyService::CreateFixed("https://myproxy.org:443"));
// Set up the proxy server as a server that supports request priorities.
- std::unique_ptr<HttpServerPropertiesImpl> http_server_properties(
- new HttpServerPropertiesImpl());
+ auto http_server_properties = base::MakeUnique<HttpServerPropertiesImpl>();
url::SchemeHostPort spdy_server("https", "myproxy.org", 443);
http_server_properties->SetSupportsSpdy(spdy_server, true);
session_deps.http_server_properties = std::move(http_server_properties);
@@ -2185,7 +2175,7 @@ class HttpStreamFactoryBidirectionalQuicTest
params_.proxy_service = proxy_service_.get();
params_.ssl_config_service = ssl_config_service_.get();
params_.client_socket_factory = &socket_factory_;
- session_.reset(new HttpNetworkSession(params_));
+ session_ = base::MakeUnique<HttpNetworkSession>(params_);
session_->quic_stream_factory()->set_require_confirmation(false);
}
@@ -2264,8 +2254,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
mock_quic_data.AddSocketDataToFactory(&socket_factory());
// Add hanging data for http job.
- std::unique_ptr<StaticSocketDataProvider> hanging_data;
- hanging_data.reset(new StaticSocketDataProvider());
+ auto hanging_data = base::MakeUnique<StaticSocketDataProvider>();
MockConnect hanging_connect(SYNCHRONOUS, ERR_IO_PENDING);
hanging_data->set_connect_data(hanging_connect);
socket_factory().AddSocketDataProvider(hanging_data.get());
@@ -2329,8 +2318,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
TEST_P(HttpStreamFactoryBidirectionalQuicTest,
RequestBidirectionalStreamImplQuicNotEnabled) {
// Make the http job fail.
- std::unique_ptr<StaticSocketDataProvider> http_job_data;
- http_job_data.reset(new StaticSocketDataProvider());
+ auto http_job_data = base::MakeUnique<StaticSocketDataProvider>();
MockConnect failed_connect(ASYNC, ERR_CONNECTION_REFUSED);
http_job_data->set_connect_data(failed_connect);
socket_factory().AddSocketDataProvider(http_job_data.get());
@@ -2392,8 +2380,7 @@ TEST_P(HttpStreamFactoryBidirectionalQuicTest,
mock_quic_data.AddSocketDataToFactory(&socket_factory());
// Make the http job fail.
- std::unique_ptr<StaticSocketDataProvider> http_job_data;
- http_job_data.reset(new StaticSocketDataProvider());
+ auto http_job_data = base::MakeUnique<StaticSocketDataProvider>();
MockConnect failed_connect(ASYNC, ERR_CONNECTION_REFUSED);
http_job_data->set_connect_data(failed_connect);
socket_factory().AddSocketDataProvider(http_job_data.get());
« net/http/http_network_transaction.cc ('K') | « net/http/http_stream_factory_impl_request_unittest.cc ('k') | net/url_request/url_request_http_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698