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

Unified Diff: jingle/notifier/base/chrome_async_socket.h

Issue 6833031: Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Review comments addressed Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: jingle/notifier/base/chrome_async_socket.h
===================================================================
--- jingle/notifier/base/chrome_async_socket.h (revision 81535)
+++ jingle/notifier/base/chrome_async_socket.h (working copy)
@@ -21,25 +21,22 @@
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "net/base/net_log.h"
-#include "net/base/ssl_config_service.h"
#include "talk/xmpp/asyncsocket.h"
namespace net {
-class CertVerifier;
class ClientSocket;
-class ClientSocketFactory;
class IOBufferWithSize;
} // namespace net
namespace notifier {
+class ResolvingClientSocketFactory;
+
class ChromeAsyncSocket : public buzz::AsyncSocket {
public:
- // Takes ownership of |client_socket_factory| but not |cert_verifier| nor
- // |net_log|. |cert_verifier| may not be NULL. |net_log| may be NULL.
- ChromeAsyncSocket(net::ClientSocketFactory* client_socket_factory,
- const net::SSLConfig& ssl_config,
- net::CertVerifier* cert_verifier,
+ // Takes ownership of |client_socket_factory| but not |net_log|.
+ // |net_log| may be NULL.
+ ChromeAsyncSocket(ResolvingClientSocketFactory* client_socket_factory,
size_t read_buf_size,
size_t write_buf_size,
net::NetLog* net_log);
@@ -187,9 +184,7 @@
net::CompletionCallbackImpl<ChromeAsyncSocket> write_callback_;
net::CompletionCallbackImpl<ChromeAsyncSocket> ssl_connect_callback_;
- scoped_ptr<net::ClientSocketFactory> client_socket_factory_;
- const net::SSLConfig ssl_config_;
- net::CertVerifier* const cert_verifier_;
+ scoped_ptr<ResolvingClientSocketFactory> client_socket_factory_;
net::BoundNetLog bound_net_log_;
// buzz::AsyncSocket state.

Powered by Google App Engine
This is Rietveld 408576698