Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Unified Diff: net/http/http_proxy_client_socket.cc

Issue 8831001: base::Bind: Convert Socket::Write. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix alignment. Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket.cc
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index ef9fb82d170798d3afe90396f9c382788ab90726..8e72f7d51933485f11d291b94f454f0461cae8d7 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -254,7 +254,14 @@ int HttpProxyClientSocket::Read(IOBuffer* buf, int buf_len,
int HttpProxyClientSocket::Write(IOBuffer* buf, int buf_len,
OldCompletionCallback* callback) {
DCHECK_EQ(STATE_DONE, next_state_);
- DCHECK(!old_user_callback_);
+ DCHECK(!old_user_callback_ && user_callback_.is_null());
+
+ return transport_->socket()->Write(buf, buf_len, callback);
+}
+int HttpProxyClientSocket::Write(IOBuffer* buf, int buf_len,
+ const CompletionCallback& callback) {
+ DCHECK_EQ(STATE_DONE, next_state_);
+ DCHECK(!old_user_callback_ && user_callback_.is_null());
return transport_->socket()->Write(buf, buf_len, callback);
}
« no previous file with comments | « net/http/http_proxy_client_socket.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698