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

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

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | « jingle/notifier/base/xmpp_client_socket_factory.h ('k') | net/base/ssl_config_service.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 9
10 namespace notifier { 10 namespace notifier {
(...skipping 15 matching lines...) Expand all
26 net::ClientSocket* transport_socket = 26 net::ClientSocket* transport_socket =
27 client_socket_factory_->CreateTCPClientSocket( 27 client_socket_factory_->CreateTCPClientSocket(
28 addresses, net_log, source); 28 addresses, net_log, source);
29 return (use_fake_ssl_client_socket_ ? 29 return (use_fake_ssl_client_socket_ ?
30 new FakeSSLClientSocket(transport_socket) : transport_socket); 30 new FakeSSLClientSocket(transport_socket) : transport_socket);
31 } 31 }
32 32
33 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( 33 net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
34 net::ClientSocketHandle* transport_socket, 34 net::ClientSocketHandle* transport_socket,
35 const std::string& hostname, 35 const std::string& hostname,
36 const net::SSLConfig& ssl_config, 36 const net::SSLConfig& ssl_config) {
37 net::SSLHostInfo* ssl_host_info) {
38 return client_socket_factory_->CreateSSLClientSocket( 37 return client_socket_factory_->CreateSSLClientSocket(
39 transport_socket, hostname, ssl_config, ssl_host_info); 38 transport_socket, hostname, ssl_config);
40 } 39 }
41 40
42 } // namespace 41 } // namespace
OLDNEW
« no previous file with comments | « jingle/notifier/base/xmpp_client_socket_factory.h ('k') | net/base/ssl_config_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698