summaryrefslogtreecommitdiffstats
path: root/net/socket/socket_test_util.cc
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 18:21:37 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 18:21:37 +0000
commitea678b000451e01b4dec557132f34deaa15eac1f (patch)
tree8f3d2505710dc34ebc26143b6c15f3292b03a8c7 /net/socket/socket_test_util.cc
parentc6ce4f6569569fb21745b698adc9ce4abb132980 (diff)
downloadchromium_src-ea678b000451e01b4dec557132f34deaa15eac1f.zip
chromium_src-ea678b000451e01b4dec557132f34deaa15eac1f.tar.gz
chromium_src-ea678b000451e01b4dec557132f34deaa15eac1f.tar.bz2
Revert 90373 - Warmth of a connection (cwnd) is estimated by the amount of data written to the socket.
Choosing the warmest connection would mean faster resource load times. Caused layout tests http/tests/loading/redirect-methods.html and http/tests/security/xss-DENIED-iframe-src-alias.html fail on deps WebKit bots, and caused http://code.google.com/p/chromium/issues/detail?id=87423 Deps bots failures: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20chromium.org&tests=http%2Ftests%2Floading%2Fredirect-methods.html%2Chttp%2Ftests%2Fsecurity%2Fxss-DENIED-iframe-src-alias.html idle time is the time a socket has remained idle (no http requests being served on it). Probability of server resetting a connection increases with idle time duration. Using a cost function that takes into account bytes transferred and idle time to pick best connection to schedule http requests on. CODEREVIEW done in http://codereview.chromium.org/6990036/ Contributed by gagansingh@google.com Review URL: http://codereview.chromium.org/7189055 TBR=gagansingh@google.com Review URL: http://codereview.chromium.org/7255002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socket_test_util.cc')
-rw-r--r--net/socket/socket_test_util.cc29
1 files changed, 0 insertions, 29 deletions
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 0573f73..4e4e8fe 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -707,7 +707,6 @@ MockTCPClientSocket::MockTCPClientSocket(const net::AddressList& addresses,
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 @@ bool MockTCPClientSocket::UsingTCPFastOpen() const {
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 @@ int MockTCPClientSocket::CompleteRead() {
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 @@ bool DeterministicMockTCPClientSocket::UsingTCPFastOpen() const {
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 @@ bool MockSSLClientSocket::UsingTCPFastOpen() const {
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_;