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

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

Issue 7014009: Pass net_log parameter properly for ProxyResolvingClientSocket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
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/xmpp_client_socket_factory.h" 5 #include "jingle/notifier/base/xmpp_client_socket_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "jingle/notifier/base/fake_ssl_client_socket.h" 8 #include "jingle/notifier/base/fake_ssl_client_socket.h"
9 #include "jingle/notifier/base/proxy_resolving_client_socket.h" 9 #include "jingle/notifier/base/proxy_resolving_client_socket.h"
10 #include "net/socket/client_socket_factory.h" 10 #include "net/socket/client_socket_factory.h"
(...skipping 10 matching lines...) Expand all
21 : client_socket_factory_(client_socket_factory), 21 : client_socket_factory_(client_socket_factory),
22 request_context_getter_(request_context_getter), 22 request_context_getter_(request_context_getter),
23 ssl_config_(ssl_config), 23 ssl_config_(ssl_config),
24 use_fake_ssl_client_socket_(use_fake_ssl_client_socket) { 24 use_fake_ssl_client_socket_(use_fake_ssl_client_socket) {
25 CHECK(client_socket_factory_); 25 CHECK(client_socket_factory_);
26 } 26 }
27 27
28 XmppClientSocketFactory::~XmppClientSocketFactory() {} 28 XmppClientSocketFactory::~XmppClientSocketFactory() {}
29 29
30 net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket( 30 net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket(
31 const net::HostPortPair& host_and_port, net::NetLog* net_log) { 31 const net::HostPortPair& host_and_port) {
32 net::StreamSocket* transport_socket = new ProxyResolvingClientSocket( 32 net::StreamSocket* transport_socket = new ProxyResolvingClientSocket(
33 request_context_getter_, 33 request_context_getter_,
34 ssl_config_, 34 ssl_config_,
35 host_and_port, 35 host_and_port);
36 net_log);
37 return (use_fake_ssl_client_socket_ ? 36 return (use_fake_ssl_client_socket_ ?
38 new FakeSSLClientSocket(transport_socket) : transport_socket); 37 new FakeSSLClientSocket(transport_socket) : transport_socket);
39 } 38 }
40 39
41 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( 40 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
42 net::ClientSocketHandle* transport_socket, 41 net::ClientSocketHandle* transport_socket,
43 const net::HostPortPair& host_and_port) { 42 const net::HostPortPair& host_and_port) {
44 return client_socket_factory_->CreateSSLClientSocket( 43 return client_socket_factory_->CreateSSLClientSocket(
45 transport_socket, host_and_port, ssl_config_, NULL, 44 transport_socket, host_and_port, ssl_config_, NULL,
46 request_context_getter_->GetURLRequestContext()->cert_verifier(), NULL); 45 request_context_getter_->GetURLRequestContext()->cert_verifier(), NULL);
47 } 46 }
48 47
49 48
50 } // namespace 49 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698