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

Side by Side Diff: net/spdy/spdy_test_util_common.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
« no previous file with comments | « net/spdy/spdy_test_util_common.h ('k') | net/url_request/url_request_context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "net/spdy/spdy_test_util_common.h" 5 #include "net/spdy/spdy_test_util_common.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <memory> 10 #include <memory>
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) 333 SpdySessionDependencies::SpdySessionDependencies(NextProto protocol)
334 : host_resolver(new MockCachingHostResolver), 334 : host_resolver(new MockCachingHostResolver),
335 cert_verifier(new MockCertVerifier), 335 cert_verifier(new MockCertVerifier),
336 channel_id_service(nullptr), 336 channel_id_service(nullptr),
337 transport_security_state(new TransportSecurityState), 337 transport_security_state(new TransportSecurityState),
338 proxy_service(ProxyService::CreateDirect()), 338 proxy_service(ProxyService::CreateDirect()),
339 ssl_config_service(new SSLConfigServiceDefaults), 339 ssl_config_service(new SSLConfigServiceDefaults),
340 socket_factory(new MockClientSocketFactory), 340 socket_factory(new MockClientSocketFactory),
341 http_auth_handler_factory( 341 http_auth_handler_factory(
342 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), 342 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())),
343 http_server_properties(new HttpServerPropertiesImpl),
343 enable_ip_pooling(true), 344 enable_ip_pooling(true),
344 enable_ping(false), 345 enable_ping(false),
345 enable_user_alternate_protocol_ports(false), 346 enable_user_alternate_protocol_ports(false),
346 enable_npn(false), 347 enable_npn(false),
347 enable_priority_dependencies(true), 348 enable_priority_dependencies(true),
348 enable_spdy31(true), 349 enable_spdy31(true),
349 enable_quic(false), 350 enable_quic(false),
350 enable_alternative_service_for_insecure_origins(true), 351 enable_alternative_service_for_insecure_origins(true),
351 protocol(protocol), 352 protocol(protocol),
352 session_max_recv_window_size( 353 session_max_recv_window_size(
(...skipping 19 matching lines...) Expand all
372 std::unique_ptr<ProxyService> proxy_service) 373 std::unique_ptr<ProxyService> proxy_service)
373 : host_resolver(new MockHostResolver), 374 : host_resolver(new MockHostResolver),
374 cert_verifier(new MockCertVerifier), 375 cert_verifier(new MockCertVerifier),
375 channel_id_service(nullptr), 376 channel_id_service(nullptr),
376 transport_security_state(new TransportSecurityState), 377 transport_security_state(new TransportSecurityState),
377 proxy_service(std::move(proxy_service)), 378 proxy_service(std::move(proxy_service)),
378 ssl_config_service(new SSLConfigServiceDefaults), 379 ssl_config_service(new SSLConfigServiceDefaults),
379 socket_factory(new MockClientSocketFactory), 380 socket_factory(new MockClientSocketFactory),
380 http_auth_handler_factory( 381 http_auth_handler_factory(
381 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())), 382 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())),
383 http_server_properties(new HttpServerPropertiesImpl),
382 enable_ip_pooling(true), 384 enable_ip_pooling(true),
383 enable_ping(false), 385 enable_ping(false),
384 enable_user_alternate_protocol_ports(false), 386 enable_user_alternate_protocol_ports(false),
385 enable_npn(false), 387 enable_npn(false),
386 enable_priority_dependencies(true), 388 enable_priority_dependencies(true),
387 enable_spdy31(true), 389 enable_spdy31(true),
388 enable_quic(false), 390 enable_quic(false),
389 enable_alternative_service_for_insecure_origins(true), 391 enable_alternative_service_for_insecure_origins(true),
390 protocol(protocol), 392 protocol(protocol),
391 session_max_recv_window_size( 393 session_max_recv_window_size(
(...skipping 29 matching lines...) Expand all
421 HttpNetworkSession::Params params; 423 HttpNetworkSession::Params params;
422 params.host_resolver = session_deps->host_resolver.get(); 424 params.host_resolver = session_deps->host_resolver.get();
423 params.cert_verifier = session_deps->cert_verifier.get(); 425 params.cert_verifier = session_deps->cert_verifier.get();
424 params.channel_id_service = session_deps->channel_id_service.get(); 426 params.channel_id_service = session_deps->channel_id_service.get();
425 params.transport_security_state = 427 params.transport_security_state =
426 session_deps->transport_security_state.get(); 428 session_deps->transport_security_state.get();
427 params.proxy_service = session_deps->proxy_service.get(); 429 params.proxy_service = session_deps->proxy_service.get();
428 params.ssl_config_service = session_deps->ssl_config_service.get(); 430 params.ssl_config_service = session_deps->ssl_config_service.get();
429 params.http_auth_handler_factory = 431 params.http_auth_handler_factory =
430 session_deps->http_auth_handler_factory.get(); 432 session_deps->http_auth_handler_factory.get();
431 params.http_server_properties = 433 params.http_server_properties = session_deps->http_server_properties.get();
432 session_deps->http_server_properties.GetWeakPtr();
433 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping; 434 params.enable_spdy_ping_based_connection_checking = session_deps->enable_ping;
434 params.enable_user_alternate_protocol_ports = 435 params.enable_user_alternate_protocol_ports =
435 session_deps->enable_user_alternate_protocol_ports; 436 session_deps->enable_user_alternate_protocol_ports;
436 params.enable_npn = session_deps->enable_npn; 437 params.enable_npn = session_deps->enable_npn;
437 params.enable_priority_dependencies = 438 params.enable_priority_dependencies =
438 session_deps->enable_priority_dependencies; 439 session_deps->enable_priority_dependencies;
439 params.enable_spdy31 = session_deps->enable_spdy31; 440 params.enable_spdy31 = session_deps->enable_spdy31;
440 params.enable_quic = session_deps->enable_quic; 441 params.enable_quic = session_deps->enable_quic;
441 params.enable_alternative_service_for_insecure_origins = 442 params.enable_alternative_service_for_insecure_origins =
442 session_deps->enable_alternative_service_for_insecure_origins; 443 session_deps->enable_alternative_service_for_insecure_origins;
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 } 1319 }
1319 } 1320 }
1320 1321
1321 void SpdyTestUtil::SetPriority(RequestPriority priority, 1322 void SpdyTestUtil::SetPriority(RequestPriority priority,
1322 SpdySynStreamIR* ir) const { 1323 SpdySynStreamIR* ir) const {
1323 ir->set_priority(ConvertRequestPriorityToSpdyPriority( 1324 ir->set_priority(ConvertRequestPriorityToSpdyPriority(
1324 priority, spdy_version())); 1325 priority, spdy_version()));
1325 } 1326 }
1326 1327
1327 } // namespace net 1328 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_test_util_common.h ('k') | net/url_request/url_request_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698