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

Side by Side Diff: jingle/glue/proxy_resolving_client_socket.cc

Issue 2821463002: Disable HTTP/2 Alternative Services. (Closed)
Patch Set: Revert change in histogram logic. Created 3 years, 8 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 | « no previous file | net/http/http_network_session.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) 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 "jingle/glue/proxy_resolving_client_socket.h" 5 #include "jingle/glue/proxy_resolving_client_socket.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // TODO(mmenke): Just copying specific parameters seems highly regression 82 // TODO(mmenke): Just copying specific parameters seems highly regression
83 // prone. Should have a better way to do this. 83 // prone. Should have a better way to do this.
84 session_params.host_mapping_rules = reference_params->host_mapping_rules; 84 session_params.host_mapping_rules = reference_params->host_mapping_rules;
85 session_params.ignore_certificate_errors = 85 session_params.ignore_certificate_errors =
86 reference_params->ignore_certificate_errors; 86 reference_params->ignore_certificate_errors;
87 session_params.testing_fixed_http_port = 87 session_params.testing_fixed_http_port =
88 reference_params->testing_fixed_http_port; 88 reference_params->testing_fixed_http_port;
89 session_params.testing_fixed_https_port = 89 session_params.testing_fixed_https_port =
90 reference_params->testing_fixed_https_port; 90 reference_params->testing_fixed_https_port;
91 session_params.enable_http2 = reference_params->enable_http2; 91 session_params.enable_http2 = reference_params->enable_http2;
92 session_params.enable_http2_alternative_service_with_different_host = 92 session_params.enable_http2_alternative_service =
93 reference_params->enable_http2_alternative_service_with_different_host; 93 reference_params->enable_http2_alternative_service;
94 session_params.enable_quic_alternative_service_with_different_host = 94 session_params.enable_quic_alternative_service_with_different_host =
95 reference_params->enable_quic_alternative_service_with_different_host; 95 reference_params->enable_quic_alternative_service_with_different_host;
96 } 96 }
97 97
98 network_session_.reset(new net::HttpNetworkSession(session_params)); 98 network_session_.reset(new net::HttpNetworkSession(session_params));
99 99
100 net::HttpAuthCache* other_auth_cache = 100 net::HttpAuthCache* other_auth_cache =
101 request_context->http_transaction_factory() 101 request_context->http_transaction_factory()
102 ->GetSession() 102 ->GetSession()
103 ->http_auth_cache(); 103 ->http_auth_cache();
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 return 0; 431 return 0;
432 } 432 }
433 433
434 void ProxyResolvingClientSocket::CloseTransportSocket() { 434 void ProxyResolvingClientSocket::CloseTransportSocket() {
435 if (transport_.get() && transport_->socket()) 435 if (transport_.get() && transport_->socket())
436 transport_->socket()->Disconnect(); 436 transport_->socket()->Disconnect();
437 transport_.reset(); 437 transport_.reset();
438 } 438 }
439 439
440 } // namespace jingle_glue 440 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698