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

Side by Side Diff: jingle/notifier/base/proxy_resolving_client_socket.cc

Issue 7827033: Introduce net::HttpServerPropertiesManager to manage server-specific properties. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | net/http/http_cache.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/notifier/base/proxy_resolving_client_socket.h" 5 #include "jingle/notifier/base/proxy_resolving_client_socket.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe. 49 // TODO(rkn): This is NULL because OriginBoundCertService is not thread safe.
50 session_params.origin_bound_cert_service = NULL; 50 session_params.origin_bound_cert_service = NULL;
51 session_params.dnsrr_resolver = request_context->dnsrr_resolver(); 51 session_params.dnsrr_resolver = request_context->dnsrr_resolver();
52 session_params.dns_cert_checker = request_context->dns_cert_checker(); 52 session_params.dns_cert_checker = request_context->dns_cert_checker();
53 session_params.proxy_service = request_context->proxy_service(); 53 session_params.proxy_service = request_context->proxy_service();
54 session_params.ssl_host_info_factory = NULL; 54 session_params.ssl_host_info_factory = NULL;
55 session_params.ssl_config_service = request_context->ssl_config_service(); 55 session_params.ssl_config_service = request_context->ssl_config_service();
56 session_params.http_auth_handler_factory = 56 session_params.http_auth_handler_factory =
57 request_context->http_auth_handler_factory(); 57 request_context->http_auth_handler_factory();
58 session_params.network_delegate = request_context->network_delegate(); 58 session_params.network_delegate = request_context->network_delegate();
59 session_params.http_server_properties =
60 request_context->http_server_properties();
59 session_params.net_log = request_context->net_log(); 61 session_params.net_log = request_context->net_log();
60 network_session_ = new net::HttpNetworkSession(session_params); 62 network_session_ = new net::HttpNetworkSession(session_params);
61 } 63 }
62 64
63 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() { 65 ProxyResolvingClientSocket::~ProxyResolvingClientSocket() {
64 Disconnect(); 66 Disconnect();
65 } 67 }
66 68
67 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len, 69 int ProxyResolvingClientSocket::Read(net::IOBuffer* buf, int buf_len,
68 net::OldCompletionCallback* callback) { 70 net::OldCompletionCallback* callback) {
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 return base::TimeDelta::FromMicroseconds(-1); 367 return base::TimeDelta::FromMicroseconds(-1);
366 } 368 }
367 369
368 void ProxyResolvingClientSocket::CloseTransportSocket() { 370 void ProxyResolvingClientSocket::CloseTransportSocket() {
369 if (transport_.get() && transport_->socket()) 371 if (transport_.get() && transport_->socket())
370 transport_->socket()->Disconnect(); 372 transport_->socket()->Disconnect();
371 transport_.reset(); 373 transport_.reset();
372 } 374 }
373 375
374 } // namespace notifier 376 } // namespace notifier
OLDNEW
« no previous file with comments | « content/shell/shell_url_request_context_getter.cc ('k') | net/http/http_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698