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

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

Issue 1811283004: Remove NetworkDelegate from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to comments Created 4 years, 9 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/http/http_network_session.h ('k') | net/spdy/spdy_test_util_common.cc » ('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) 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_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 : client_socket_factory(NULL), 74 : client_socket_factory(NULL),
75 host_resolver(NULL), 75 host_resolver(NULL),
76 cert_verifier(NULL), 76 cert_verifier(NULL),
77 ct_policy_enforcer(NULL), 77 ct_policy_enforcer(NULL),
78 channel_id_service(NULL), 78 channel_id_service(NULL),
79 transport_security_state(NULL), 79 transport_security_state(NULL),
80 cert_transparency_verifier(NULL), 80 cert_transparency_verifier(NULL),
81 proxy_service(NULL), 81 proxy_service(NULL),
82 ssl_config_service(NULL), 82 ssl_config_service(NULL),
83 http_auth_handler_factory(NULL), 83 http_auth_handler_factory(NULL),
84 network_delegate(NULL),
85 net_log(NULL), 84 net_log(NULL),
86 host_mapping_rules(NULL), 85 host_mapping_rules(NULL),
87 socket_performance_watcher_factory(NULL), 86 socket_performance_watcher_factory(NULL),
88 ignore_certificate_errors(false), 87 ignore_certificate_errors(false),
89 testing_fixed_http_port(0), 88 testing_fixed_http_port(0),
90 testing_fixed_https_port(0), 89 testing_fixed_https_port(0),
91 enable_tcp_fast_open_for_ssl(false), 90 enable_tcp_fast_open_for_ssl(false),
92 enable_spdy_ping_based_connection_checking(true), 91 enable_spdy_ping_based_connection_checking(true),
93 spdy_default_protocol(kProtoUnknown), 92 spdy_default_protocol(kProtoUnknown),
94 enable_spdy31(true), 93 enable_spdy31(true),
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 quic_supported_versions.push_back(QUIC_VERSION_29); 135 quic_supported_versions.push_back(QUIC_VERSION_29);
137 } 136 }
138 137
139 HttpNetworkSession::Params::Params(const Params& other) = default; 138 HttpNetworkSession::Params::Params(const Params& other) = default;
140 139
141 HttpNetworkSession::Params::~Params() {} 140 HttpNetworkSession::Params::~Params() {}
142 141
143 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 142 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
144 HttpNetworkSession::HttpNetworkSession(const Params& params) 143 HttpNetworkSession::HttpNetworkSession(const Params& params)
145 : net_log_(params.net_log), 144 : net_log_(params.net_log),
146 network_delegate_(params.network_delegate),
147 http_server_properties_(params.http_server_properties), 145 http_server_properties_(params.http_server_properties),
148 cert_verifier_(params.cert_verifier), 146 cert_verifier_(params.cert_verifier),
149 http_auth_handler_factory_(params.http_auth_handler_factory), 147 http_auth_handler_factory_(params.http_auth_handler_factory),
150 proxy_service_(params.proxy_service), 148 proxy_service_(params.proxy_service),
151 ssl_config_service_(params.ssl_config_service), 149 ssl_config_service_(params.ssl_config_service),
152 quic_stream_factory_( 150 quic_stream_factory_(
153 params.host_resolver, 151 params.host_resolver,
154 params.client_socket_factory 152 params.client_socket_factory
155 ? params.client_socket_factory 153 ? params.client_socket_factory
156 : ClientSocketFactory::GetDefaultFactory(), 154 : ClientSocketFactory::GetDefaultFactory(),
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 case WEBSOCKET_SOCKET_POOL: 385 case WEBSOCKET_SOCKET_POOL:
388 return websocket_socket_pool_manager_.get(); 386 return websocket_socket_pool_manager_.get();
389 default: 387 default:
390 NOTREACHED(); 388 NOTREACHED();
391 break; 389 break;
392 } 390 }
393 return NULL; 391 return NULL;
394 } 392 }
395 393
396 } // namespace net 394 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698