summaryrefslogtreecommitdiffstats
path: root/net/socket/socket_test_util.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 23:25:19 +0000
commit5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf (patch)
tree4f39f1f44be3eb179f8368bca0bc18512e398a40 /net/socket/socket_test_util.cc
parentf852667f469ea8fd31b8a1dd0f0130382efe591f (diff)
downloadchromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.zip
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.gz
chromium_src-5a05c47ae2a497d4efbbb9166fa5ff7aebfd4ecf.tar.bz2
Add LoadLog to ClientSocket::Connect().
TODO: Use LoadLog in FLIP code. Review URL: http://codereview.chromium.org/344026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r--net/socket/socket_test_util.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 60ef70c..5433a65 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -72,7 +72,8 @@ MockTCPClientSocket::MockTCPClientSocket(const net::AddressList& addresses,
data_->Reset();
}
-int MockTCPClientSocket::Connect(net::CompletionCallback* callback) {
+int MockTCPClientSocket::Connect(net::CompletionCallback* callback,
+ LoadLog* load_log) {
if (connected_)
return net::OK;
connected_ = true;
@@ -176,10 +177,11 @@ void MockSSLClientSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
ssl_info->Reset();
}
-int MockSSLClientSocket::Connect(net::CompletionCallback* callback) {
+int MockSSLClientSocket::Connect(net::CompletionCallback* callback,
+ LoadLog* load_log) {
ConnectCallback* connect_callback = new ConnectCallback(
this, callback, data_->connect.result);
- int rv = transport_->Connect(connect_callback);
+ int rv = transport_->Connect(connect_callback, load_log);
if (rv == net::OK) {
delete connect_callback;
if (data_->connect.async) {