summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 21:33:58 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 21:33:58 +0000
commite91ac22d99252095839ca7c82c092972bd56445e (patch)
tree0054d7c65bd3ec21de4b2c776220788849b21e6a /net/spdy
parent30d170b85b632ffe2babc4e0955b2b09851540dc (diff)
downloadchromium_src-e91ac22d99252095839ca7c82c092972bd56445e.zip
chromium_src-e91ac22d99252095839ca7c82c092972bd56445e.tar.gz
chromium_src-e91ac22d99252095839ca7c82c092972bd56445e.tar.bz2
Remove BindStateHolder and have Bind() return a Callback<> object directly.
This removes some complexity and also fixes a bug where if you call Bind() with the result of Bind(), the resulting Callback would only be valid during the first call. Ouch. BUG=none TEST=new unittests Review URL: http://codereview.chromium.org/8738001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_proxy_client_socket_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc
index d7d2626..c21080f 100644
--- a/net/spdy/spdy_proxy_client_socket_unittest.cc
+++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -1276,8 +1276,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(),