Index: net/socket/socket_test_util.cc |
=================================================================== |
--- net/socket/socket_test_util.cc (revision 90388) |
+++ net/socket/socket_test_util.cc (working copy) |
@@ -707,7 +707,6 @@ |
addresses_(addresses), |
data_(data), |
read_offset_(0), |
- num_bytes_read_(0), |
read_data_(false, net::ERR_UNEXPECTED), |
need_read_data_(true), |
peer_closed_connection_(false), |
@@ -812,17 +811,6 @@ |
return false; |
} |
-int64 MockTCPClientSocket::NumBytesRead() const { |
- return num_bytes_read_; |
-} |
- |
-base::TimeDelta MockTCPClientSocket::GetConnectTimeMicros() const { |
- // Dummy value. |
- static const base::TimeDelta kTestingConnectTimeMicros = |
- base::TimeDelta::FromMicroseconds(20); |
- return kTestingConnectTimeMicros; |
-} |
- |
void MockTCPClientSocket::OnReadComplete(const MockRead& data) { |
// There must be a read pending. |
DCHECK(pending_buf_); |
@@ -865,7 +853,6 @@ |
result = std::min(buf_len, read_data_.data_len - read_offset_); |
memcpy(buf->data(), read_data_.data + read_offset_, result); |
read_offset_ += result; |
- num_bytes_read_ += result; |
if (read_offset_ == read_data_.data_len) { |
need_read_data_ = true; |
read_offset_ = 0; |
@@ -1014,14 +1001,6 @@ |
return false; |
} |
-int64 DeterministicMockTCPClientSocket::NumBytesRead() const { |
- return -1; |
-} |
- |
-base::TimeDelta DeterministicMockTCPClientSocket::GetConnectTimeMicros() const { |
- return base::TimeDelta::FromMicroseconds(-1); |
-} |
- |
void DeterministicMockTCPClientSocket::OnReadComplete(const MockRead& data) {} |
class MockSSLClientSocket::ConnectCallback |
@@ -1115,14 +1094,6 @@ |
return transport_->socket()->UsingTCPFastOpen(); |
} |
-int64 MockSSLClientSocket::NumBytesRead() const { |
- return -1; |
-} |
- |
-base::TimeDelta MockSSLClientSocket::GetConnectTimeMicros() const { |
- return base::TimeDelta::FromMicroseconds(-1); |
-} |
- |
void MockSSLClientSocket::GetSSLInfo(net::SSLInfo* ssl_info) { |
ssl_info->Reset(); |
ssl_info->cert = data_->cert_; |
Property changes on: net/socket/socket_test_util.cc |
___________________________________________________________________ |
Added: svn:mergeinfo |