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

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

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 years, 4 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 | « ios/crnet/crnet_environment.mm ('k') | 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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 session_params.ignore_certificate_errors = 79 session_params.ignore_certificate_errors =
80 reference_params->ignore_certificate_errors; 80 reference_params->ignore_certificate_errors;
81 session_params.testing_fixed_http_port = 81 session_params.testing_fixed_http_port =
82 reference_params->testing_fixed_http_port; 82 reference_params->testing_fixed_http_port;
83 session_params.testing_fixed_https_port = 83 session_params.testing_fixed_https_port =
84 reference_params->testing_fixed_https_port; 84 reference_params->testing_fixed_https_port;
85 session_params.next_protos = reference_params->next_protos; 85 session_params.next_protos = reference_params->next_protos;
86 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; 86 session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
87 session_params.forced_spdy_exclusions = 87 session_params.forced_spdy_exclusions =
88 reference_params->forced_spdy_exclusions; 88 reference_params->forced_spdy_exclusions;
89 session_params.use_alternate_protocols = 89 session_params.use_alternative_services =
90 reference_params->use_alternate_protocols; 90 reference_params->use_alternative_services;
91 } 91 }
92 92
93 network_session_ = new net::HttpNetworkSession(session_params); 93 network_session_ = new net::HttpNetworkSession(session_params);
94 } 94 }
95 95
96 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { 96 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() {
97 Disconnect(); 97 Disconnect();
98 } 98 }
99 99
100 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len, 100 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 out->clear(); 425 out->clear();
426 } 426 }
427 427
428 void ProxyResolvingClientSocket::CloseTransportSocket() { 428 void ProxyResolvingClientSocket::CloseTransportSocket() {
429 if (transport_.get() && transport_->socket()) 429 if (transport_.get() && transport_->socket())
430 transport_->socket()->Disconnect(); 430 transport_->socket()->Disconnect();
431 transport_.reset(); 431 transport_.reset();
432 } 432 }
433 433
434 } // namespace jingle_glue 434 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « ios/crnet/crnet_environment.mm ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698