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

Unified Diff: net/socket/socket_test_util.cc

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 9 months 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/socket/socket_test_util.h ('k') | net/socket/socks5_client_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/socket_test_util.cc
===================================================================
--- net/socket/socket_test_util.cc (revision 191149)
+++ net/socket/socket_test_util.cc (working copy)
@@ -792,7 +792,6 @@
addresses_(addresses),
data_(data),
read_offset_(0),
- num_bytes_read_(0),
read_data_(SYNCHRONOUS, ERR_UNEXPECTED),
need_read_data_(true),
peer_closed_connection_(false),
@@ -902,17 +901,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;
-}
-
bool MockTCPClientSocket::WasNpnNegotiated() const {
return false;
}
@@ -963,7 +951,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;
@@ -1112,14 +1099,6 @@
return false;
}
-int64 DeterministicMockTCPClientSocket::NumBytesRead() const {
- return -1;
-}
-
-base::TimeDelta DeterministicMockTCPClientSocket::GetConnectTimeMicros() const {
- return base::TimeDelta::FromMicroseconds(-1);
-}
-
bool DeterministicMockTCPClientSocket::WasNpnNegotiated() const {
return false;
}
@@ -1206,18 +1185,10 @@
return transport_->socket()->UsingTCPFastOpen();
}
-int64 MockSSLClientSocket::NumBytesRead() const {
- return -1;
-}
-
int MockSSLClientSocket::GetPeerAddress(IPEndPoint* address) const {
return transport_->socket()->GetPeerAddress(address);
}
-base::TimeDelta MockSSLClientSocket::GetConnectTimeMicros() const {
- return base::TimeDelta::FromMicroseconds(-1);
-}
-
bool MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
ssl_info->Reset();
ssl_info->cert = data_->cert;
« no previous file with comments | « net/socket/socket_test_util.h ('k') | net/socket/socks5_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698