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

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

Issue 517693002: Add embedder-specific headers to HTTP CONNECT tunnel request (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reworked HaveAuth test Created 6 years, 3 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/http/http_network_transaction_unittest.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/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/debug/stack_trace.h" 10 #include "base/debug/stack_trace.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 : net::ClientSocketFactory::GetDefaultFactory(), 43 : net::ClientSocketFactory::GetDefaultFactory(),
44 params.host_resolver, 44 params.host_resolver,
45 params.cert_verifier, 45 params.cert_verifier,
46 params.channel_id_service, 46 params.channel_id_service,
47 params.transport_security_state, 47 params.transport_security_state,
48 params.cert_transparency_verifier, 48 params.cert_transparency_verifier,
49 params.ssl_session_cache_shard, 49 params.ssl_session_cache_shard,
50 params.proxy_service, 50 params.proxy_service,
51 params.ssl_config_service, 51 params.ssl_config_service,
52 params.enable_ssl_connect_job_waiting, 52 params.enable_ssl_connect_job_waiting,
53 params.proxy_delegate,
53 pool_type); 54 pool_type);
54 } 55 }
55 56
56 } // unnamed namespace 57 } // unnamed namespace
57 58
58 namespace net { 59 namespace net {
59 60
60 HttpNetworkSession::Params::Params() 61 HttpNetworkSession::Params::Params()
61 : client_socket_factory(NULL), 62 : client_socket_factory(NULL),
62 host_resolver(NULL), 63 host_resolver(NULL),
(...skipping 26 matching lines...) Expand all
89 enable_websocket_over_spdy(false), 90 enable_websocket_over_spdy(false),
90 enable_quic(false), 91 enable_quic(false),
91 enable_quic_port_selection(true), 92 enable_quic_port_selection(true),
92 enable_quic_time_based_loss_detection(false), 93 enable_quic_time_based_loss_detection(false),
93 quic_always_require_handshake_confirmation(false), 94 quic_always_require_handshake_confirmation(false),
94 quic_disable_connection_pooling(false), 95 quic_disable_connection_pooling(false),
95 quic_clock(NULL), 96 quic_clock(NULL),
96 quic_random(NULL), 97 quic_random(NULL),
97 quic_max_packet_length(kDefaultMaxPacketSize), 98 quic_max_packet_length(kDefaultMaxPacketSize),
98 enable_user_alternate_protocol_ports(false), 99 enable_user_alternate_protocol_ports(false),
99 quic_crypto_client_stream_factory(NULL) { 100 quic_crypto_client_stream_factory(NULL),
101 proxy_delegate(NULL) {
100 quic_supported_versions.push_back(QUIC_VERSION_19); 102 quic_supported_versions.push_back(QUIC_VERSION_19);
101 } 103 }
102 104
103 HttpNetworkSession::Params::~Params() {} 105 HttpNetworkSession::Params::~Params() {}
104 106
105 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 107 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
106 HttpNetworkSession::HttpNetworkSession(const Params& params) 108 HttpNetworkSession::HttpNetworkSession(const Params& params)
107 : net_log_(params.net_log), 109 : net_log_(params.net_log),
108 network_delegate_(params.network_delegate), 110 network_delegate_(params.network_delegate),
109 http_server_properties_(params.http_server_properties), 111 http_server_properties_(params.http_server_properties),
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 case WEBSOCKET_SOCKET_POOL: 312 case WEBSOCKET_SOCKET_POOL:
311 return websocket_socket_pool_manager_.get(); 313 return websocket_socket_pool_manager_.get();
312 default: 314 default:
313 NOTREACHED(); 315 NOTREACHED();
314 break; 316 break;
315 } 317 }
316 return NULL; 318 return NULL;
317 } 319 }
318 320
319 } // namespace net 321 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698