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 deabd4feefdd29f49b1b411c2e90bb2d807de752..2e6f92797b324d5e1d287db4b54f66ef180c7ad4 100644 |
--- a/net/spdy/spdy_network_transaction_unittest.cc |
+++ b/net/spdy/spdy_network_transaction_unittest.cc |
@@ -115,9 +115,9 @@ SpdySessionDependencies* CreateSpdySessionDependencies( |
SpdySessionDependencies* CreateSpdySessionDependencies( |
pauljensen
2015/08/28 13:38:03
would be nice to make this a scoped_ptr too
Randy Smith (Not in Mondays)
2015/09/02 23:42:20
Done.
|
SpdyNetworkTransactionTestParams test_params, |
- ProxyService* proxy_service) { |
+ scoped_ptr<ProxyService> proxy_service) { |
SpdySessionDependencies* session_deps = |
- new SpdySessionDependencies(test_params.protocol, proxy_service); |
+ new SpdySessionDependencies(test_params.protocol, proxy_service.Pass()); |
UpdateSpdySessionDependencies(test_params, session_deps); |
return session_deps; |
} |
@@ -4488,6 +4488,7 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredProxyRetry) { |
HttpRequestInfo request; |
request.method = "GET"; |
request.url = GURL("https://www.example.org/"); |
+ |
pauljensen
2015/08/28 13:38:02
unnecessary whitespace change?
Randy Smith (Not in Mondays)
2015/09/02 23:42:20
Done.
|
scoped_ptr<SpdySessionDependencies> session_deps( |
CreateSpdySessionDependencies( |
GetParam(), |
@@ -4584,9 +4585,9 @@ TEST_P(SpdyNetworkTransactionTest, HTTP11RequiredProxyRetry) { |
TEST_P(SpdyNetworkTransactionTest, ProxyConnect) { |
NormalSpdyTransactionHelper helper(CreateGetRequest(), DEFAULT_PRIORITY, |
BoundNetLog(), GetParam(), NULL); |
+ |
pauljensen
2015/08/28 13:38:02
ditto
Randy Smith (Not in Mondays)
2015/09/02 23:42:20
Done.
|
helper.session_deps().reset(CreateSpdySessionDependencies( |
- GetParam(), |
- ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"))); |
+ GetParam(), ProxyService::CreateFixedFromPacResult("PROXY myproxy:70"))); |
pauljensen
2015/08/28 13:38:02
a formatting change...to an unrelated line...perha
Randy Smith (Not in Mondays)
2015/09/02 23:42:20
Moot, since there's now a substantive change on 45
|
helper.SetSession(make_scoped_refptr( |
SpdySessionDependencies::SpdyCreateSession(helper.session_deps().get()))); |
helper.RunPreTestSetup(); |