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

Side by Side Diff: net/quic/quic_end_to_end_unittest.cc

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <memory> 5 #include <memory>
6 #include <ostream> 6 #include <ostream>
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 if (GetParam().use_stateless_rejects) { 114 if (GetParam().use_stateless_rejects) {
115 params_.quic_connection_options.push_back(kSREJ); 115 params_.quic_connection_options.push_back(kSREJ);
116 } 116 }
117 params_.host_resolver = &host_resolver_; 117 params_.host_resolver = &host_resolver_;
118 params_.cert_verifier = &cert_verifier_; 118 params_.cert_verifier = &cert_verifier_;
119 params_.transport_security_state = &transport_security_state_; 119 params_.transport_security_state = &transport_security_state_;
120 params_.cert_transparency_verifier = cert_transparency_verifier_.get(); 120 params_.cert_transparency_verifier = cert_transparency_verifier_.get();
121 params_.proxy_service = proxy_service_.get(); 121 params_.proxy_service = proxy_service_.get();
122 params_.ssl_config_service = ssl_config_service_.get(); 122 params_.ssl_config_service = ssl_config_service_.get();
123 params_.http_auth_handler_factory = auth_handler_factory_.get(); 123 params_.http_auth_handler_factory = auth_handler_factory_.get();
124 params_.http_server_properties = http_server_properties.GetWeakPtr(); 124 params_.http_server_properties = &http_server_properties_;
125 channel_id_service_.reset( 125 channel_id_service_.reset(
126 new ChannelIDService(new DefaultChannelIDStore(nullptr), 126 new ChannelIDService(new DefaultChannelIDStore(nullptr),
127 base::ThreadTaskRunnerHandle::Get())); 127 base::ThreadTaskRunnerHandle::Get()));
128 params_.channel_id_service = channel_id_service_.get(); 128 params_.channel_id_service = channel_id_service_.get();
129 129
130 CertVerifyResult verify_result; 130 CertVerifyResult verify_result;
131 verify_result.verified_cert = ImportCertFromFile( 131 verify_result.verified_cert = ImportCertFromFile(
132 GetTestCertsDirectory(), "quic_test.example.com.crt"); 132 GetTestCertsDirectory(), "quic_test.example.com.crt");
133 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(), 133 cert_verifier_.AddResultForCertAndHost(verify_result.verified_cert.get(),
134 "test.example.com", verify_result, 134 "test.example.com", verify_result,
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 247
248 std::unique_ptr<MockHostResolver> host_resolver_impl_; 248 std::unique_ptr<MockHostResolver> host_resolver_impl_;
249 MappedHostResolver host_resolver_; 249 MappedHostResolver host_resolver_;
250 MockCertVerifier cert_verifier_; 250 MockCertVerifier cert_verifier_;
251 std::unique_ptr<ChannelIDService> channel_id_service_; 251 std::unique_ptr<ChannelIDService> channel_id_service_;
252 TransportSecurityState transport_security_state_; 252 TransportSecurityState transport_security_state_;
253 std::unique_ptr<CTVerifier> cert_transparency_verifier_; 253 std::unique_ptr<CTVerifier> cert_transparency_verifier_;
254 scoped_refptr<SSLConfigServiceDefaults> ssl_config_service_; 254 scoped_refptr<SSLConfigServiceDefaults> ssl_config_service_;
255 std::unique_ptr<ProxyService> proxy_service_; 255 std::unique_ptr<ProxyService> proxy_service_;
256 std::unique_ptr<HttpAuthHandlerFactory> auth_handler_factory_; 256 std::unique_ptr<HttpAuthHandlerFactory> auth_handler_factory_;
257 HttpServerPropertiesImpl http_server_properties; 257 HttpServerPropertiesImpl http_server_properties_;
258 HttpNetworkSession::Params params_; 258 HttpNetworkSession::Params params_;
259 std::unique_ptr<TestTransactionFactory> transaction_factory_; 259 std::unique_ptr<TestTransactionFactory> transaction_factory_;
260 HttpRequestInfo request_; 260 HttpRequestInfo request_;
261 std::string request_body_; 261 std::string request_body_;
262 std::unique_ptr<UploadDataStream> upload_data_stream_; 262 std::unique_ptr<UploadDataStream> upload_data_stream_;
263 std::unique_ptr<ServerThread> server_thread_; 263 std::unique_ptr<ServerThread> server_thread_;
264 IPEndPoint server_address_; 264 IPEndPoint server_address_;
265 std::string server_hostname_; 265 std::string server_hostname_;
266 QuicConfig server_config_; 266 QuicConfig server_config_;
267 QuicCryptoServerConfig::ConfigOptions server_config_options_; 267 QuicCryptoServerConfig::ConfigOptions server_config_options_;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 base::MessageLoop::current()->Run(); 374 base::MessageLoop::current()->Run();
375 375
376 for (size_t i = 0; i < num_requests; ++i) { 376 for (size_t i = 0; i < num_requests; ++i) {
377 CheckResponse(*consumers[i], "HTTP/1.1 200", kResponseBody); 377 CheckResponse(*consumers[i], "HTTP/1.1 200", kResponseBody);
378 } 378 }
379 STLDeleteElements(&consumers); 379 STLDeleteElements(&consumers);
380 } 380 }
381 381
382 } // namespace test 382 } // namespace test
383 } // namespace net 383 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/properties_based_quic_server_info_test.cc ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698