base::Bind: Convert Socket::Read.

base::Bind: Convert Socket::Read.

BUG=none
TEST=none
R=csilv

[James Hawkins, 2011-12-06 23:44:21]

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
File jingle/glue/channel_socket_adapter.cc (right):

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:137: } else if (read_callback_.is_null())
{
This should be else if (!read_callback_.is_null()).

[James Hawkins, 2011-12-06 23:45:04]

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
File jingle/glue/channel_socket_adapter.cc (right):

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:137: } else if (read_callback_.is_null())
{
On 2011/12/06 23:44:23, James Hawkins wrote:
> This should be else if (!read_callback_.is_null()).

Done.

[James Hawkins, 2011-12-07 00:01:57]

http://codereview.chromium.org/8801005/diff/4050/chrome/browser/chromeos/web_...
File chrome/browser/chromeos/web_socket_proxy.cc (right):

http://codereview.chromium.org/8801005/diff/4050/chrome/browser/chromeos/web_...
chrome/browser/chromeos/web_socket_proxy.cc:799: net::CompletionCallback
socket_connect_callback_;
#include "net/base/completion_callback.h"

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/channel_socket_a...
File jingle/glue/channel_socket_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/channel_socket_a...
jingle/glue/channel_socket_adapter.h:58: net::CompletionCallback read_callback_;
#include "net/base/completion_callback.h"

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapter.h
File jingle/glue/pseudotcp_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
jingle/glue/pseudotcp_adapter.h:20: // PseudoTcpAdapter adapts a connection-less
net::Socket to a connection-
I'm gonna revert this part of the change.

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
File jingle/glue/pseudotcp_adapter_unittest.cc (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
jingle/glue/pseudotcp_adapter_unittest.cc:190: net::CompletionCallback
read_callback_;
#include "net/base/completion_callback.h"

http://codereview.chromium.org/8801005/diff/4050/net/socket/socket_test_util.h
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/8801005/diff/4050/net/socket/socket_test_util....
net/socket/socket_test_util.h:685: net::CompletionCallback pending_callback_;
#include "net/base/completion_callback.h"

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/fake_sessi...
File remoting/protocol/fake_session.h (right):

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/fake_sessi...
remoting/protocol/fake_session.h:72: net::CompletionCallback read_callback_;
#include "net/base/completion_callback.h"

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/pepper_tra...
File remoting/protocol/pepper_transport_socket_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/pepper_tra...
remoting/protocol/pepper_transport_socket_adapter.h:97: net::CompletionCallback
read_callback_;
#include "net/base/completion_callback.h"

[csilv, 2011-12-07 00:03:47]

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
File jingle/glue/channel_socket_adapter.cc (right):

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:42: CHECK(!old_read_callback_);
make same as line 61

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:61: CHECK(!old_read_callback_ &&
read_callback_.is_null());
Do we want this to be a CHECK instead of DCHECK?  I only bring this up because
in most other instances, this is a DCHECK

http://codereview.chromium.org/8801005/diff/1/net/curvecp/messenger.cc
File net/curvecp/messenger.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/curvecp/messenger.cc#newcode75
net/curvecp/messenger.cc:75: DCHECK(!old_receive_complete_callback_);
change this to match line 91

http://codereview.chromium.org/8801005/diff/1/net/http/http_proxy_client_sock...
File net/http/http_proxy_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/http/http_proxy_client_sock...
net/http/http_proxy_client_socket.cc:217: DCHECK(!old_user_callback_);
change to match check on line 236

http://codereview.chromium.org/8801005/diff/1/net/socket/socket_test_util.cc
File net/socket/socket_test_util.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/socket_test_util.cc#...
net/socket/socket_test_util.cc:1492: pending_callback_.Reset();
kill this line

http://codereview.chromium.org/8801005/diff/1/net/socket/socks5_client_socket.cc
File net/socket/socks5_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/socks5_client_socket...
net/socket/socks5_client_socket.cc:191: DCHECK(!old_user_callback_);
change to match line 199

http://codereview.chromium.org/8801005/diff/1/net/socket/socks_client_socket.cc
File net/socket/socks_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/socks_client_socket....
net/socket/socks_client_socket.cc:219: DCHECK(!old_user_callback_);
change to match line 227

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
File net/socket/ssl_client_socket_nss.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:570: DCHECK(!old_user_read_callback_);
this should probably also check user_read_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:572: DCHECK(!old_user_connect_callback_);
this should probably also check user_connect_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:618: DCHECK(!old_user_read_callback_);
this should probably also check user_read_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:811: DCHECK(!old_user_connect_callback_);
this should probabably also check user_connect_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:835: DCHECK(!old_user_connect_callback_);
this should probabably also check user_connect_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_op...
File net/socket/ssl_client_socket_openssl.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_op...
net/socket/ssl_client_socket_openssl.cc:1215: old_user_read_callback_ =
callback;
user_read_callback_ = callback;

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
File net/socket/ssl_server_socket_nss.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
net/socket/ssl_server_socket_nss.cc:157: DCHECK(!old_user_read_callback_);
also check user_read_callback_

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
net/socket/ssl_server_socket_nss.cc:744: // Since Run may result in Read being
called, clear |old_user_read_callback_|
nit, this comment applies to both old and new callback, but i don't think it's
necessary to change since its temporary

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
File net/socket/tcp_client_socket_win.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
net/socket/tcp_client_socket_win.cc:712: DCHECK(!old_read_callback_);
change to match line 753

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
net/socket/tcp_client_socket_win.cc:784: old_read_callback_ = callback;
read_callback_ = callback;

http://codereview.chromium.org/8801005/diff/1/net/socket/web_socket_server_so...
File net/socket/web_socket_server_socket_unittest.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/web_socket_server_so...
net/socket/web_socket_server_socket_unittest.cc:212:
ScopedRunnableMethodFactory<TestingTransportSocket> method_factory_;
could we update this to a WeakFactory and get rid of the RunnableMethod calls in
this file?

http://codereview.chromium.org/8801005/diff/1/net/udp/udp_socket_libevent.h
File net/udp/udp_socket_libevent.h (right):

http://codereview.chromium.org/8801005/diff/1/net/udp/udp_socket_libevent.h#n...
net/udp/udp_socket_libevent.h:122: if (socket_->old_read_callback_)
also check for read_callback_ here

http://codereview.chromium.org/8801005/diff/1/remoting/protocol/fake_session.cc
File remoting/protocol/fake_session.cc (right):

http://codereview.chromium.org/8801005/diff/1/remoting/protocol/fake_session....
remoting/protocol/fake_session.cc:192: old_read_callback_->Run(result);
read_callback_.Run(result)

[csilv, 2011-12-07 00:06:42]

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
File jingle/glue/channel_socket_adapter.cc (right):

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:61: CHECK(!old_read_callback_ &&
read_callback_.is_null());
On 2011/12/07 00:03:48, csilv wrote:
> Do we want this to be a CHECK instead of DCHECK?  I only bring this up because
> in most other instances, this is a DCHECK

You can probably disregard this as we do use CHECK for this test in other
cases... (but its a bit of both.)

[James Hawkins, 2011-12-07 00:08:11]

http://codereview.chromium.org/8801005/diff/4050/chrome/browser/chromeos/web_...
File chrome/browser/chromeos/web_socket_proxy.cc (right):

http://codereview.chromium.org/8801005/diff/4050/chrome/browser/chromeos/web_...
chrome/browser/chromeos/web_socket_proxy.cc:799: net::CompletionCallback
socket_connect_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/channel_socket_a...
File jingle/glue/channel_socket_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/channel_socket_a...
jingle/glue/channel_socket_adapter.h:58: net::CompletionCallback read_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapter.h
File jingle/glue/pseudotcp_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
jingle/glue/pseudotcp_adapter.h:20: // PseudoTcpAdapter adapts a connection-less
net::Socket to a connection-
On 2011/12/07 00:01:57, James Hawkins wrote:
> I'm gonna revert this part of the change.

Done.

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
File jingle/glue/pseudotcp_adapter_unittest.cc (right):

http://codereview.chromium.org/8801005/diff/4050/jingle/glue/pseudotcp_adapte...
jingle/glue/pseudotcp_adapter_unittest.cc:190: net::CompletionCallback
read_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

http://codereview.chromium.org/8801005/diff/4050/net/socket/socket_test_util.h
File net/socket/socket_test_util.h (right):

http://codereview.chromium.org/8801005/diff/4050/net/socket/socket_test_util....
net/socket/socket_test_util.h:685: net::CompletionCallback pending_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/fake_sessi...
File remoting/protocol/fake_session.h (right):

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/fake_sessi...
remoting/protocol/fake_session.h:72: net::CompletionCallback read_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/pepper_tra...
File remoting/protocol/pepper_transport_socket_adapter.h (right):

http://codereview.chromium.org/8801005/diff/4050/remoting/protocol/pepper_tra...
remoting/protocol/pepper_transport_socket_adapter.h:97: net::CompletionCallback
read_callback_;
On 2011/12/07 00:01:57, James Hawkins wrote:
> #include "net/base/completion_callback.h"

Done.

[James Hawkins, 2011-12-07 00:19:36]

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
File jingle/glue/channel_socket_adapter.cc (right):

http://codereview.chromium.org/8801005/diff/1/jingle/glue/channel_socket_adap...
jingle/glue/channel_socket_adapter.cc:42: CHECK(!old_read_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> make same as line 61

Done.

http://codereview.chromium.org/8801005/diff/1/net/curvecp/messenger.cc
File net/curvecp/messenger.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/curvecp/messenger.cc#newcode75
net/curvecp/messenger.cc:75: DCHECK(!old_receive_complete_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> change this to match line 91

Done.

http://codereview.chromium.org/8801005/diff/1/net/http/http_proxy_client_sock...
File net/http/http_proxy_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/http/http_proxy_client_sock...
net/http/http_proxy_client_socket.cc:217: DCHECK(!old_user_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> change to match check on line 236

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/socks5_client_socket.cc
File net/socket/socks5_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/socks5_client_socket...
net/socket/socks5_client_socket.cc:191: DCHECK(!old_user_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> change to match line 199

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/socks_client_socket.cc
File net/socket/socks_client_socket.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/socks_client_socket....
net/socket/socks_client_socket.cc:219: DCHECK(!old_user_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> change to match line 227

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
File net/socket/ssl_client_socket_nss.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:570: DCHECK(!old_user_read_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> this should probably also check user_read_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:572: DCHECK(!old_user_connect_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> this should probably also check user_connect_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:618: DCHECK(!old_user_read_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> this should probably also check user_read_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:811: DCHECK(!old_user_connect_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> this should probabably also check user_connect_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_ns...
net/socket/ssl_client_socket_nss.cc:835: DCHECK(!old_user_connect_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> this should probabably also check user_connect_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_op...
File net/socket/ssl_client_socket_openssl.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_client_socket_op...
net/socket/ssl_client_socket_openssl.cc:1215: old_user_read_callback_ =
callback;
On 2011/12/07 00:03:48, csilv wrote:
> user_read_callback_ = callback;

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
File net/socket/ssl_server_socket_nss.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
net/socket/ssl_server_socket_nss.cc:157: DCHECK(!old_user_read_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> also check user_read_callback_

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/ssl_server_socket_ns...
net/socket/ssl_server_socket_nss.cc:744: // Since Run may result in Read being
called, clear |old_user_read_callback_|
On 2011/12/07 00:03:48, csilv wrote:
> nit, this comment applies to both old and new callback, but i don't think it's
> necessary to change since its temporary

I changed it to s/old_// so it'll be right once it's all done.

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
File net/socket/tcp_client_socket_win.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
net/socket/tcp_client_socket_win.cc:712: DCHECK(!old_read_callback_);
On 2011/12/07 00:03:48, csilv wrote:
> change to match line 753

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/tcp_client_socket_wi...
net/socket/tcp_client_socket_win.cc:784: old_read_callback_ = callback;
On 2011/12/07 00:03:48, csilv wrote:
> read_callback_ = callback;

Done.

http://codereview.chromium.org/8801005/diff/1/net/socket/web_socket_server_so...
File net/socket/web_socket_server_socket_unittest.cc (right):

http://codereview.chromium.org/8801005/diff/1/net/socket/web_socket_server_so...
net/socket/web_socket_server_socket_unittest.cc:212:
ScopedRunnableMethodFactory<TestingTransportSocket> method_factory_;
On 2011/12/07 00:03:48, csilv wrote:
> could we update this to a WeakFactory and get rid of the RunnableMethod calls
in
> this file?

Prob best done in a followup CL.

http://codereview.chromium.org/8801005/diff/1/net/udp/udp_socket_libevent.h
File net/udp/udp_socket_libevent.h (right):

http://codereview.chromium.org/8801005/diff/1/net/udp/udp_socket_libevent.h#n...
net/udp/udp_socket_libevent.h:122: if (socket_->old_read_callback_)
On 2011/12/07 00:03:48, csilv wrote:
> also check for read_callback_ here

Done.

[csilv, 2011-12-07 00:53:54]

lgtm