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

Side by Side Diff: net/http/http_response_body_drainer_unittest.cc

Issue 2907463002: Split HttpNetworkSession::Params into two structs. (Closed)
Patch Set: Response to comments Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_response_body_drainer.h" 5 #include "net/http/http_response_body_drainer.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <cstring> 9 #include <cstring>
10 10
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 : proxy_service_(ProxyService::CreateDirect()), 238 : proxy_service_(ProxyService::CreateDirect()),
239 ssl_config_service_(new SSLConfigServiceDefaults), 239 ssl_config_service_(new SSLConfigServiceDefaults),
240 http_server_properties_(new HttpServerPropertiesImpl()), 240 http_server_properties_(new HttpServerPropertiesImpl()),
241 session_(CreateNetworkSession()), 241 session_(CreateNetworkSession()),
242 mock_stream_(new MockHttpStream(&result_waiter_)), 242 mock_stream_(new MockHttpStream(&result_waiter_)),
243 drainer_(new HttpResponseBodyDrainer(mock_stream_)) {} 243 drainer_(new HttpResponseBodyDrainer(mock_stream_)) {}
244 244
245 ~HttpResponseBodyDrainerTest() override {} 245 ~HttpResponseBodyDrainerTest() override {}
246 246
247 HttpNetworkSession* CreateNetworkSession() { 247 HttpNetworkSession* CreateNetworkSession() {
248 HttpNetworkSession::Params params; 248 HttpNetworkSession::Context context;
249 params.proxy_service = proxy_service_.get(); 249 context.proxy_service = proxy_service_.get();
250 params.ssl_config_service = ssl_config_service_.get(); 250 context.ssl_config_service = ssl_config_service_.get();
251 params.http_server_properties = http_server_properties_.get(); 251 context.http_server_properties = http_server_properties_.get();
252 params.cert_verifier = &cert_verifier_; 252 context.cert_verifier = &cert_verifier_;
253 params.transport_security_state = &transport_security_state_; 253 context.transport_security_state = &transport_security_state_;
254 params.cert_transparency_verifier = &ct_verifier_; 254 context.cert_transparency_verifier = &ct_verifier_;
255 params.ct_policy_enforcer = &ct_policy_enforcer_; 255 context.ct_policy_enforcer = &ct_policy_enforcer_;
256 return new HttpNetworkSession(params); 256 return new HttpNetworkSession(HttpNetworkSession::Params(), context);
257 } 257 }
258 258
259 std::unique_ptr<ProxyService> proxy_service_; 259 std::unique_ptr<ProxyService> proxy_service_;
260 scoped_refptr<SSLConfigService> ssl_config_service_; 260 scoped_refptr<SSLConfigService> ssl_config_service_;
261 std::unique_ptr<HttpServerPropertiesImpl> http_server_properties_; 261 std::unique_ptr<HttpServerPropertiesImpl> http_server_properties_;
262 MockCertVerifier cert_verifier_; 262 MockCertVerifier cert_verifier_;
263 TransportSecurityState transport_security_state_; 263 TransportSecurityState transport_security_state_;
264 MultiLogCTVerifier ct_verifier_; 264 MultiLogCTVerifier ct_verifier_;
265 CTPolicyEnforcer ct_policy_enforcer_; 265 CTPolicyEnforcer ct_policy_enforcer_;
266 const std::unique_ptr<HttpNetworkSession> session_; 266 const std::unique_ptr<HttpNetworkSession> session_;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 TEST_F(HttpResponseBodyDrainerTest, DrainBodyCantReuse) { 341 TEST_F(HttpResponseBodyDrainerTest, DrainBodyCantReuse) {
342 mock_stream_->set_num_chunks(1); 342 mock_stream_->set_num_chunks(1);
343 mock_stream_->set_can_reuse_connection(false); 343 mock_stream_->set_can_reuse_connection(false);
344 drainer_->Start(session_.get()); 344 drainer_->Start(session_.get());
345 EXPECT_TRUE(result_waiter_.WaitForResult()); 345 EXPECT_TRUE(result_waiter_.WaitForResult());
346 } 346 }
347 347
348 } // namespace 348 } // namespace
349 349
350 } // namespace net 350 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_ssl_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698