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

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: Addressed comments from mef and mmenke 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
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 24 matching lines...) Expand all
87 use_alternate_protocols(false), 88 use_alternate_protocols(false),
88 alternate_protocol_probability_threshold(1), 89 alternate_protocol_probability_threshold(1),
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_clock(NULL), 94 quic_clock(NULL),
94 quic_random(NULL), 95 quic_random(NULL),
95 quic_max_packet_length(kDefaultMaxPacketSize), 96 quic_max_packet_length(kDefaultMaxPacketSize),
96 enable_user_alternate_protocol_ports(false), 97 enable_user_alternate_protocol_ports(false),
97 quic_crypto_client_stream_factory(NULL) { 98 quic_crypto_client_stream_factory(NULL),
99 proxy_delegate(NULL) {
98 quic_supported_versions.push_back(QUIC_VERSION_21); 100 quic_supported_versions.push_back(QUIC_VERSION_21);
99 } 101 }
100 102
101 HttpNetworkSession::Params::~Params() {} 103 HttpNetworkSession::Params::~Params() {}
102 104
103 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 105 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
104 HttpNetworkSession::HttpNetworkSession(const Params& params) 106 HttpNetworkSession::HttpNetworkSession(const Params& params)
105 : net_log_(params.net_log), 107 : net_log_(params.net_log),
106 network_delegate_(params.network_delegate), 108 network_delegate_(params.network_delegate),
107 http_server_properties_(params.http_server_properties), 109 http_server_properties_(params.http_server_properties),
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 case WEBSOCKET_SOCKET_POOL: 310 case WEBSOCKET_SOCKET_POOL:
309 return websocket_socket_pool_manager_.get(); 311 return websocket_socket_pool_manager_.get();
310 default: 312 default:
311 NOTREACHED(); 313 NOTREACHED();
312 break; 314 break;
313 } 315 }
314 return NULL; 316 return NULL;
315 } 317 }
316 318
317 } // namespace net 319 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698