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

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 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
« no previous file with comments | « net/http/http_stream_factory_impl_request.cc ('k') | net/http/http_stream_parser.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 cac7f02d254583abdb332ce8ab758f8dcb5ea55a..6f4e6ea5512eb2666e872e3cf73749c707a552de 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -152,7 +152,7 @@ HttpNetworkSession* CreateSession(SessionDependencies* session_deps) {
params.host_resolver = session_deps->host_resolver.get();
params.cert_verifier = session_deps->cert_verifier.get();
params.proxy_service = session_deps->proxy_service.get();
- params.ssl_config_service = session_deps->ssl_config_service;
+ params.ssl_config_service = session_deps->ssl_config_service.get();
params.client_socket_factory = &session_deps->socket_factory;
params.http_auth_handler_factory =
session_deps->http_auth_handler_factory.get();
@@ -321,7 +321,7 @@ TEST(HttpStreamFactoryTest, PreconnectDirect) {
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool);
peer.SetClientSocketPoolManager(mock_pool_manager);
- PreconnectHelper(kTests[i], session);
+ PreconnectHelper(kTests[i], session.get());
if (kTests[i].ssl)
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams());
else
@@ -348,7 +348,7 @@ TEST(HttpStreamFactoryTest, PreconnectHttpProxy) {
mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool);
mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool);
peer.SetClientSocketPoolManager(mock_pool_manager);
- PreconnectHelper(kTests[i], session);
+ PreconnectHelper(kTests[i], session.get());
if (kTests[i].ssl)
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams());
else
@@ -376,7 +376,7 @@ TEST(HttpStreamFactoryTest, PreconnectSocksProxy) {
mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_proxy_pool);
mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool);
peer.SetClientSocketPoolManager(mock_pool_manager);
- PreconnectHelper(kTests[i], session);
+ PreconnectHelper(kTests[i], session.get());
if (kTests[i].ssl)
EXPECT_EQ(kTests[i].num_streams, ssl_conn_pool->last_num_streams());
else
@@ -410,7 +410,7 @@ TEST(HttpStreamFactoryTest, PreconnectDirectWithExistingSpdySession) {
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
mock_pool_manager->SetSSLSocketPool(ssl_conn_pool);
peer.SetClientSocketPoolManager(mock_pool_manager);
- PreconnectHelper(kTests[i], session);
+ PreconnectHelper(kTests[i], session.get());
// We shouldn't be preconnecting if we have an existing session, which is
// the case for https://www.google.com.
if (kTests[i].ssl)
@@ -438,7 +438,7 @@ TEST(HttpStreamFactoryTest, PreconnectUnsafePort) {
mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
peer.SetClientSocketPoolManager(mock_pool_manager);
- PreconnectHelperForURL(1, GURL("http://www.google.com:7"), session);
+ PreconnectHelperForURL(1, GURL("http://www.google.com:7"), session.get());
EXPECT_EQ(-1, transport_conn_pool->last_num_streams());
}
« no previous file with comments | « net/http/http_stream_factory_impl_request.cc ('k') | net/http/http_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698