net/spdy/spdy_test_util_common.h - Issue 1298253002: Remove reference counting from HttpNetworkSession.

Unified Diff: net/spdy/spdy_test_util_common.h

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

Index: net/spdy/spdy_test_util_common.h

diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h

index 57f5c3b643c2e96169eb1d819ed9f4f34471c8d2..e03a068b6112ddaa5581f7d08672a746b9bb256a 100644

--- a/net/spdy/spdy_test_util_common.h

+++ b/net/spdy/spdy_test_util_common.h

@@ -193,9 +193,9 @@ struct SpdySessionDependencies {

~SpdySessionDependencies();

- static HttpNetworkSession* SpdyCreateSession(

+ static scoped_ptr<HttpNetworkSession> SpdyCreateSession(

SpdySessionDependencies* session_deps);

- static HttpNetworkSession* SpdyCreateSessionDeterministic(

+ static scoped_ptr<HttpNetworkSession> SpdyCreateSessionDeterministic(

SpdySessionDependencies* session_deps);

static HttpNetworkSession::Params CreateSessionParams(

SpdySessionDependencies* session_deps);

@@ -243,7 +243,7 @@ bool HasSpdySession(SpdySessionPool* pool, const SpdySessionKey& key);

// session pool in |http_session|. A SPDY session for |key| must not

// already exist.

base::WeakPtr<SpdySession> CreateInsecureSpdySession(

- const scoped_refptr<HttpNetworkSession>& http_session,

+ const scoped_ptr<HttpNetworkSession>& http_session,

pauljensen 2015/09/02 14:32:30 Should be a raw pointer.

mmenke 2015/09/02 16:29:34 Done. Also searched the entire CL for this mistak

const SpdySessionKey& key,

const BoundNetLog& net_log);

@@ -252,14 +252,14 @@ base::WeakPtr<SpdySession> CreateInsecureSpdySession(

// not already exist. The session will be created but close in the

// next event loop iteration.

base::WeakPtr<SpdySession> TryCreateInsecureSpdySessionExpectingFailure(

- const scoped_refptr<HttpNetworkSession>& http_session,

+ const scoped_ptr<HttpNetworkSession>& http_session,

pauljensen 2015/09/02 14:32:30 ditto

mmenke 2015/09/02 16:29:34 Done.

const SpdySessionKey& key,

Error expected_error,

const BoundNetLog& net_log);

// Like CreateInsecureSpdySession(), but uses TLS.

base::WeakPtr<SpdySession> CreateSecureSpdySession(

- const scoped_refptr<HttpNetworkSession>& http_session,

+ const scoped_ptr<HttpNetworkSession>& http_session,

pauljensen 2015/09/02 14:32:30 ditto

mmenke 2015/09/02 16:29:34 Done.

const SpdySessionKey& key,

const BoundNetLog& net_log);

« net/spdy/spdy_network_transaction_unittest.cc ('K') | « net/spdy/spdy_stream_unittest.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | net/spdy/spdy_test_util_common.cc » ('J')