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

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

Issue 7802002: Jingle unit tests for issue 87336 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments and rebase. Created 9 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 | Annotate | Revision Log
« no previous file with comments | « jingle/notifier/base/proxy_resolving_client_socket_unittest.cc ('k') | no next file » | 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/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 13 matching lines...) Expand all
24 ssl_config_(ssl_config), 24 ssl_config_(ssl_config),
25 use_fake_ssl_client_socket_(use_fake_ssl_client_socket) { 25 use_fake_ssl_client_socket_(use_fake_ssl_client_socket) {
26 CHECK(client_socket_factory_); 26 CHECK(client_socket_factory_);
27 } 27 }
28 28
29 XmppClientSocketFactory::~XmppClientSocketFactory() {} 29 XmppClientSocketFactory::~XmppClientSocketFactory() {}
30 30
31 net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket( 31 net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket(
32 const net::HostPortPair& host_and_port) { 32 const net::HostPortPair& host_and_port) {
33 net::StreamSocket* transport_socket = new ProxyResolvingClientSocket( 33 net::StreamSocket* transport_socket = new ProxyResolvingClientSocket(
34 NULL,
34 request_context_getter_, 35 request_context_getter_,
35 ssl_config_, 36 ssl_config_,
36 host_and_port); 37 host_and_port);
37 return (use_fake_ssl_client_socket_ ? 38 return (use_fake_ssl_client_socket_ ?
38 new FakeSSLClientSocket(transport_socket) : transport_socket); 39 new FakeSSLClientSocket(transport_socket) : transport_socket);
39 } 40 }
40 41
41 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( 42 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
42 net::ClientSocketHandle* transport_socket, 43 net::ClientSocketHandle* transport_socket,
43 const net::HostPortPair& host_and_port) { 44 const net::HostPortPair& host_and_port) {
44 net::SSLClientSocketContext context; 45 net::SSLClientSocketContext context;
45 context.cert_verifier = 46 context.cert_verifier =
46 request_context_getter_->GetURLRequestContext()->cert_verifier(); 47 request_context_getter_->GetURLRequestContext()->cert_verifier();
47 // TODO(rkn): context.origin_bound_cert_service is NULL because the 48 // TODO(rkn): context.origin_bound_cert_service is NULL because the
48 // OriginBoundCertService class is not thread safe. 49 // OriginBoundCertService class is not thread safe.
49 return client_socket_factory_->CreateSSLClientSocket( 50 return client_socket_factory_->CreateSSLClientSocket(
50 transport_socket, host_and_port, ssl_config_, NULL, context); 51 transport_socket, host_and_port, ssl_config_, NULL, context);
51 } 52 }
52 53
53 54
54 } // namespace 55 } // namespace
OLDNEW
« no previous file with comments | « jingle/notifier/base/proxy_resolving_client_socket_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698