Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all...

jingle/notifier/base/xmpp_connection.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/notifier/base/xmpp_connection.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "jingle/notifier/base/chrome_async_socket.h"
 #include "jingle/notifier/base/task_pump.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
-#include "jingle/notifier/base/xmpp_client_socket_factory.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/client_socket_factory.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
 namespace {
 
 buzz::AsyncSocket* CreateSocket(
     const buzz::XmppClientSettings& xmpp_client_settings,
-    net::CertVerifier* cert_verifier) {
+    const scoped_refptr<net::URLRequestContextGetter>& request_context_getter) {
   bool use_fake_ssl_client_socket =
       (xmpp_client_settings.protocol() == cricket::PROTO_SSLTCP);
-  net::ClientSocketFactory* const client_socket_factory =
-      new XmppClientSocketFactory(
-          net::ClientSocketFactory::GetDefaultFactory(),
-          use_fake_ssl_client_socket);
   // The default SSLConfig is good enough for us for now.
   const net::SSLConfig ssl_config;
   // These numbers were taken from similar numbers in
   // XmppSocketAdapter.
   const size_t kReadBufSize = 64U * 1024U;
   const size_t kWriteBufSize = 64U * 1024U;
   // TODO(akalin): Use a real NetLog.
   net::NetLog* const net_log = NULL;
-  return new ChromeAsyncSocket(
-      client_socket_factory, ssl_config, cert_verifier,
-      kReadBufSize, kWriteBufSize, net_log);
+  return new ChromeAsyncSocket(ssl_config, request_context_getter,
+                               use_fake_ssl_client_socket,
+                               kReadBufSize, kWriteBufSize, net_log);
 }
 
 }  // namespace
 
 XmppConnection::XmppConnection(
     const buzz::XmppClientSettings& xmpp_client_settings,
-    net::CertVerifier* cert_verifier,
+    const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
     Delegate* delegate, buzz::PreXmppAuth* pre_xmpp_auth)
     : task_pump_(new TaskPump()),
       on_connect_called_(false),
       delegate_(delegate) {
   DCHECK(delegate_);
   // Owned by |task_pump_|, but is guaranteed to live at least as long
   // as this function.
   WeakXmppClient* weak_xmpp_client = new WeakXmppClient(task_pump_.get());
   weak_xmpp_client->SignalStateChange.connect(
       this, &XmppConnection::OnStateChange);
   weak_xmpp_client->SignalLogInput.connect(
       this, &XmppConnection::OnInputLog);
   weak_xmpp_client->SignalLogOutput.connect(
       this, &XmppConnection::OnOutputLog);
   const char kLanguage[] = "en";
   buzz::XmppReturnStatus connect_status =
       weak_xmpp_client->Connect(xmpp_client_settings, kLanguage,
                                 CreateSocket(xmpp_client_settings,
-                                             cert_verifier),
+                                             request_context_getter),
                                 pre_xmpp_auth);
   // buzz::XmppClient::Connect() should never fail.
   DCHECK_EQ(connect_status, buzz::XMPP_RETURN_OK);
   weak_xmpp_client->Start();
   weak_xmpp_client_ = weak_xmpp_client->AsWeakPtr();
 }
 
 XmppConnection::~XmppConnection() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   ClearClient();
@@ skipping 55 matching lines @@
 }
 
 void XmppConnection::ClearClient() {
   if (weak_xmpp_client_.get()) {
     weak_xmpp_client_->Invalidate();
     DCHECK(!weak_xmpp_client_.get());
   }
 }
 
 }  // namespace notifier