Remove BindStateHolder and have Bind() return a Callback<> object directly.

net/spdy/spdy_proxy_client_socket_unittest.cc

Index: net/spdy/spdy_proxy_client_socket_unittest.cc
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index 25be93a82d4aa1430b2dc96245eaf1effcf27eea..f5d5a369629b6aeec3b1dd24ee52dd7b6eed79d3 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -1346,8 +1346,8 @@ TEST_F(SpdyProxyClientSocketTest, RstWithReadAndWritePendingDelete) {
   scoped_refptr<IOBuffer> read_buf(new IOBuffer(kLen1));
   ASSERT_EQ(ERR_IO_PENDING,
             sock_->Read(read_buf, kLen1,
-                        base::Bind(&DeleteSockCallback::Run<int>,
-                                   base::Unretained(&read_callback))));
+                        base::Bind(&OldCompletionCallbackAdapter,
+                                   &read_callback)));
 
   scoped_refptr<IOBufferWithSize> write_buf(CreateBuffer(kMsg1, kLen1));
   EXPECT_EQ(ERR_IO_PENDING, sock_->Write(write_buf, write_buf->size(),