Revert 90373 - Warmth of a connection (cwnd) is estimated by the amount of data written to the so...

net/socket/socket_test_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 
@@ skipping 689 matching lines @@
     callback->Run(result);
 }
 
 MockTCPClientSocket::MockTCPClientSocket(const net::AddressList& addresses,
                                          net::NetLog* net_log,
                                          net::SocketDataProvider* data)
     : MockClientSocket(net_log),
       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),
       pending_buf_(NULL),
       pending_buf_len_(0),
       pending_callback_(NULL),
       was_used_to_convey_data_(false) {
   DCHECK(data_);
   data_->Reset();
 }
@@ skipping 84 matching lines @@
 }
 
 bool MockTCPClientSocket::WasEverUsed() const {
   return was_used_to_convey_data_;
 }
 
 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_);
   // You can't complete a read with another ERR_IO_PENDING status code.
   DCHECK_NE(ERR_IO_PENDING, data.result);
   // Since we've been waiting for data, need_read_data_ should be true.
   DCHECK(need_read_data_);
 
   read_data_ = data;
   need_read_data_ = false;
@@ skipping 22 matching lines @@
   pending_callback_ = NULL;
 
   int result = read_data_.result;
   DCHECK(result != ERR_IO_PENDING);
 
   if (read_data_.data) {
     if (read_data_.data_len - read_offset_ > 0) {
       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;
       }
     } else {
       result = 0;  // EOF
     }
   }
 
   if (read_data_.async) {
@@ skipping 128 matching lines @@
 }
 
 bool DeterministicMockTCPClientSocket::WasEverUsed() const {
   return was_used_to_convey_data_;
 }
 
 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
     : public net::CompletionCallbackImpl<MockSSLClientSocket::ConnectCallback> {
  public:
   ConnectCallback(MockSSLClientSocket *ssl_client_socket,
                   net::CompletionCallback* user_callback,
                   int rv)
       : ALLOW_THIS_IN_INITIALIZER_LIST(
           net::CompletionCallbackImpl<MockSSLClientSocket::ConnectCallback>(
@@ skipping 73 matching lines @@
 }
 
 bool MockSSLClientSocket::WasEverUsed() const {
   return transport_->socket()->WasEverUsed();
 }
 
 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_;
 }
 
 void MockSSLClientSocket::GetSSLCertRequestInfo(
     net::SSLCertRequestInfo* cert_request_info) {
   DCHECK(cert_request_info);
   if (data_->cert_request_info) {
     cert_request_info->host_and_port =
@@ skipping 384 matching lines @@
 
 const char kSOCKS5OkRequest[] =
     { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
 
 const char kSOCKS5OkResponse[] =
     { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
 
 }  // namespace net