Remove deprecated functions that take StreamSockets instead of handles

net/socket/socks_client_socket_unittest.cc

Index: net/socket/socks_client_socket_unittest.cc
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 7a8faf6985662c6ada85f37a18e157ee4406ab92..90c854bbe1a779880f14a64e1936d64eec7f32cc 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_client_socket_unittest.cc
@@ -37,6 +37,8 @@ class SOCKSClientSocketTest : public PlatformTest {
  protected:
   scoped_ptr<SOCKSClientSocket> user_sock_;
   AddressList address_list_;
+  // Filled in by BuildMockSocket() and owned by its return value
+  // (which |user_sock| is set to).
   StreamSocket* tcp_sock_;
   TestCompletionCallback callback_;
   scoped_ptr<MockHostResolver> host_resolver_;
@@ -73,7 +75,11 @@ SOCKSClientSocket* SOCKSClientSocketTest::BuildMockSocket(
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(tcp_sock_->IsConnected());
 
-  return new SOCKSClientSocket(tcp_sock_,
+  scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
+  // |connection| takes ownership of |tcp_sock_|, but we still keep a
+  // non-owning pointer to it.

[Ryan Sleevi, 2013/08/13 20:26:13]

same comment nit: s/we still//

https://groups.google.com/a/chromium.org/d/msg/chromium-dev/NH-S6KCkr2M/yv0z3...

[akalin, 2013/08/13 20:51:28]

Done.

+  connection->set_socket(tcp_sock_);
+  return new SOCKSClientSocket(connection.release(),

[Ryan Sleevi, 2013/08/13 20:26:13]

same style nit: linebreak

[akalin, 2013/08/13 20:51:28]

Done.

       HostResolver::RequestInfo(HostPortPair(hostname, port)),
       host_resolver);
 }