Migrate net/socket/socket.h, net/socket/stream_socket.h to base::Bind().

jingle/notifier/base/proxy_resolving_client_socket_unittest.cc

 // 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/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 56 matching lines @@
 };
 
 // TODO(sanjeevr): Fix this test on Linux.
 TEST_F(ProxyResolvingClientSocketTest, DISABLED_ConnectError) {
   net::HostPortPair dest("0.0.0.0", 0);
   ProxyResolvingClientSocket proxy_resolving_socket(
       NULL,
       url_request_context_getter_,
       net::SSLConfig(),
       dest);
-  TestOldCompletionCallback callback;
-  int status = proxy_resolving_socket.Connect(&callback);
+  net::TestCompletionCallback callback;
+  int status = proxy_resolving_socket.Connect(callback.callback());
   // Connect always returns ERR_IO_PENDING because it is always asynchronous.
   EXPECT_EQ(net::ERR_IO_PENDING, status);
   status = callback.WaitForResult();
   // ProxyResolvingClientSocket::Connect() will always return an error of
   // ERR_ADDRESS_INVALID for a 0 IP address.
   EXPECT_EQ(net::ERR_ADDRESS_INVALID, status);
 }
 
 TEST_F(ProxyResolvingClientSocketTest, ReportsBadProxies) {
   net::HostPortPair dest("example.com", 443);
@@ skipping 16 matching lines @@
                                              writes, arraysize(writes));
   socket_data2.set_connect_data(net::MockConnect(true, net::OK));
   socket_factory.AddSocketDataProvider(&socket_data2);
 
   ProxyResolvingClientSocket proxy_resolving_socket(
       &socket_factory,
       url_request_context_getter_,
       net::SSLConfig(),
       dest);
 
-  TestOldCompletionCallback callback;
-  int status = proxy_resolving_socket.Connect(&callback);
+  net::TestCompletionCallback callback;
+  int status = proxy_resolving_socket.Connect(callback.callback());
   EXPECT_EQ(net::ERR_IO_PENDING, status);
   status = callback.WaitForResult();
   EXPECT_EQ(net::OK, status);
 
   net::URLRequestContext* context =
       url_request_context_getter_->GetURLRequestContext();
   const net::ProxyRetryInfoMap& retry_info =
       context->proxy_service()->proxy_retry_info();
 
   EXPECT_EQ(1u, retry_info.size());
   net::ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99");
   EXPECT_TRUE(iter != retry_info.end());
 }
 
 // TODO(sanjeevr): Add more unit-tests.
 }  // namespace notifier