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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/spdy/spdy_network_transaction_unittest.cc

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed too much, back up a bit Created 5 years, 4 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_unittest.cc ('K') | « net/spdy/spdy_http_stream_unittest.cc ('k') | net/spdy/spdy_proxy_client_socket_unittest.cc » ('j') | net/spdy/spdy_test_util_common.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index 218bed047de976fda3eaa298a78917536c5e9f55..cca5508c120cfb35a783c2464042bdbeed36c470 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -370,16 +370,14 @@ class SpdyNetworkTransactionTest
}
}
- void SetSession(const scoped_refptr<HttpNetworkSession>& session) {
- session_ = session;
+ void SetSession(scoped_ptr<HttpNetworkSession> session) {
+ session_ = session.Pass();
}
HttpNetworkTransaction* trans() { return trans_.get(); }
void ResetTrans() { trans_.reset(); }
TransactionHelperResult& output() { return output_; }
const HttpRequestInfo& request() const { return request_; }
- const scoped_refptr<HttpNetworkSession>& session() const {
- return session_;
- }
+ HttpNetworkSession* session() const { return session_.get(); }
scoped_ptr<SpdySessionDependencies>& session_deps() {
return session_deps_;
}
@@ -397,7 +395,7 @@ class SpdyNetworkTransactionTest
HttpRequestInfo request_;
RequestPriority priority_;
scoped_ptr<SpdySessionDependencies> session_deps_;
- scoped_refptr<HttpNetworkSession> session_;
+ scoped_ptr<HttpNetworkSession> session_;
TransactionHelperResult output_;
scoped_ptr<SocketDataProvider> first_transaction_;
SSLVector ssl_vector_;
@@ -586,7 +584,7 @@ class SpdyNetworkTransactionTest
SpdySessionKey key(host_port_pair, ProxyServer::Direct(),
PRIVACY_MODE_DISABLED);
BoundNetLog log;
- const scoped_refptr<HttpNetworkSession>& session = helper.session();
+ HttpNetworkSession* session = helper.session();
base::WeakPtr<SpdySession> spdy_session =
session->spdy_session_pool()->FindAvailableSession(key, log);
ASSERT_TRUE(spdy_session != NULL);
@@ -614,7 +612,7 @@ class SpdyNetworkTransactionTest
// Request the pushed path.
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
rv = trans2->Start(
&CreateGetPushRequest(), callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -653,12 +651,11 @@ class SpdyNetworkTransactionTest
helper->ResetTrans();
}
- static void StartTransactionCallback(
- const scoped_refptr<HttpNetworkSession>& session,
- GURL url,
- int result) {
+ static void StartTransactionCallback(HttpNetworkSession* session,
+ GURL url,
+ int result) {
scoped_ptr<HttpNetworkTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
TestCompletionCallback callback;
HttpRequestInfo request;
request.method = "GET";
@@ -723,7 +720,7 @@ INSTANTIATE_TEST_CASE_P(
TEST_P(SpdyNetworkTransactionTest, Constructor) {
scoped_ptr<SpdySessionDependencies> session_deps(
CreateSpdySessionDependencies(GetParam()));
- scoped_refptr<HttpNetworkSession> session(
+ scoped_ptr<HttpNetworkSession> session(
SpdySessionDependencies::SpdyCreateSession(session_deps.get()));
scoped_ptr<HttpTransaction> trans(
new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
@@ -891,11 +888,11 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGets) {
helper.AddData(&data_placeholder);
helper.AddData(&data_placeholder);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans3(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -976,9 +973,9 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
// on will negotiate SPDY and will be used for all requests.
helper.AddData(&data_placeholder);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -1064,9 +1061,9 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
helper.AddData(&data_placeholder);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -1181,11 +1178,11 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrent) {
helper.RunPreTestSetup();
helper.AddData(&data);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans3(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -1316,13 +1313,13 @@ TEST_P(SpdyNetworkTransactionTest, FourGetsWithMaxConcurrentPriority) {
helper.AddData(&data);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans3(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans4(
- new HttpNetworkTransaction(HIGHEST, helper.session().get()));
+ new HttpNetworkTransaction(HIGHEST, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -1445,11 +1442,11 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) {
helper.RunPreTestSetup();
helper.AddData(&data);
scoped_ptr<HttpNetworkTransaction> trans1(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
scoped_ptr<HttpNetworkTransaction> trans3(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -1576,10 +1573,10 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentSocketClose) {
// there needs to be three sets of SSL connection data.
helper.AddData(&data_placeholder);
helper.AddData(&data_placeholder);
- HttpNetworkTransaction trans1(DEFAULT_PRIORITY, helper.session().get());
- HttpNetworkTransaction trans2(DEFAULT_PRIORITY, helper.session().get());
+ HttpNetworkTransaction trans1(DEFAULT_PRIORITY, helper.session());
+ HttpNetworkTransaction trans2(DEFAULT_PRIORITY, helper.session());
HttpNetworkTransaction* trans3(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback1;
TestCompletionCallback callback2;
@@ -4583,8 +4580,9 @@ TEST_P(SpdyNetworkTransactionTest, ProxyConnect) {
helper.session_deps().reset(CreateSpdySessionDependencies(
GetParam(),
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70")));
- helper.SetSession(make_scoped_refptr(
- SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get())));
+ scoped_ptr<HttpNetworkSession> session(
+ SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get()));
+ helper.SetSession(session.Pass());
pauljensen 2015/09/02 14:32:29 Combining these three lines into the following cod
mmenke 2015/09/02 16:29:34 Done.
helper.RunPreTestSetup();
HttpNetworkTransaction* trans = helper.trans();
@@ -4648,8 +4646,9 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
helper.session_deps().reset(CreateSpdySessionDependencies(
GetParam(),
ProxyService::CreateFixedFromPacResult("DIRECT; PROXY myproxy:70")));
- helper.SetSession(make_scoped_refptr(
- SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get())));
+ scoped_ptr<HttpNetworkSession> session(
+ SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get()));
+ helper.SetSession(session.Pass());
pauljensen 2015/09/02 14:32:29 ditto
mmenke 2015/09/02 16:29:34 Done.
SpdySessionPool* spdy_session_pool = helper.session()->spdy_session_pool();
helper.RunPreTestSetup();
@@ -4734,16 +4733,16 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) {
scoped_ptr<SpdySessionDependencies> ssd_proxy(
CreateSpdySessionDependencies(GetParam()));
// Ensure that this transaction uses the same SpdySessionPool.
- scoped_refptr<HttpNetworkSession> session_proxy(
+ scoped_ptr<HttpNetworkSession> session_proxy(
SpdySessionDependencies::SpdyCreateSession(ssd_proxy.get()));
NormalSpdyTransactionHelper helper_proxy(request_proxy, DEFAULT_PRIORITY,
BoundNetLog(), GetParam(), NULL);
- HttpNetworkSessionPeer session_peer(session_proxy);
+ HttpNetworkSessionPeer session_peer(session_proxy.get());
scoped_ptr<ProxyService> proxy_service(
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"));
session_peer.SetProxyService(proxy_service.get());
helper_proxy.session_deps().swap(ssd_proxy);
- helper_proxy.SetSession(session_proxy);
+ helper_proxy.SetSession(session_proxy.Pass());
helper_proxy.RunPreTestSetup();
helper_proxy.AddData(data_proxy.get());
@@ -4818,7 +4817,7 @@ TEST_P(SpdyNetworkTransactionTest, VerifyRetryOnConnectionReset) {
for (int i = 0; i < 2; ++i) {
scoped_ptr<HttpNetworkTransaction> trans(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
TestCompletionCallback callback;
int rv = trans->Start(
@@ -5134,7 +5133,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) {
// Request the pushed path. At this point, we've received the push, but the
// headers are not yet complete.
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
rv = trans2->Start(
&CreateGetPushRequest(), callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5272,7 +5271,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithTwoHeaderFrames) {
// Request the pushed path. At this point, we've received the push, but the
// headers are not yet complete.
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
rv = trans2->Start(
&CreateGetPushRequest(), callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5388,7 +5387,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithNoStatusHeaderFrames) {
// Request the pushed path. At this point, we've received the push, but the
// headers are not yet complete.
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session().get()));
+ new HttpNetworkTransaction(DEFAULT_PRIORITY, helper.session()));
rv = trans2->Start(
&CreateGetPushRequest(), callback.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
@@ -5727,7 +5726,7 @@ TEST_P(SpdyNetworkTransactionTest, OutOfOrderSynStream) {
HttpRequestInfo info2 = CreateGetRequest();
TestCompletionCallback callback2;
scoped_ptr<HttpNetworkTransaction> trans2(
- new HttpNetworkTransaction(MEDIUM, helper.session().get()));
+ new HttpNetworkTransaction(MEDIUM, helper.session()));
rv = trans2->Start(&info2, callback2.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
base::RunLoop().RunUntilIdle();
@@ -5735,7 +5734,7 @@ TEST_P(SpdyNetworkTransactionTest, OutOfOrderSynStream) {
HttpRequestInfo info3 = CreateGetRequest();
TestCompletionCallback callback3;
scoped_ptr<HttpNetworkTransaction> trans3(
- new HttpNetworkTransaction(HIGHEST, helper.session().get()));
+ new HttpNetworkTransaction(HIGHEST, helper.session()));
rv = trans3->Start(&info3, callback3.callback(), BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
base::RunLoop().RunUntilIdle();
« net/http/http_network_transaction_unittest.cc ('K') | « net/spdy/spdy_http_stream_unittest.cc ('k') | net/spdy/spdy_proxy_client_socket_unittest.cc » ('j') | net/spdy/spdy_test_util_common.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698