Remove experimental code to pick the "warmest" socket

(based on age and bytes received) in favor of older
algorithm to pick the most recently used socket.

Tests showed no real performance difference, so
defaulting to the older, simpler, and more intuitive
algorithm.

This is basically a revert of
https://codereview.chromium.org/7251004

TBR=sergeyu@chromium.org
BUG=222090
Review URL: https://codereview.chromium.org/12886034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191507 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 0 insertions, 38 deletions

diff --git a/jingle/glue/fake_ssl_client_socket.cc b/jingle/glue/fake_ssl_client_socket.cc
index 19beb1f..4817ce9 100644
--- a/jingle/glue/fake_ssl_client_socket.cc
+++ b/jingle/glue/fake_ssl_client_socket.cc
@@ -330,14 +330,6 @@ bool FakeSSLClientSocket::UsingTCPFastOpen() const {
   return transport_socket_->UsingTCPFastOpen();
 }
 
-int64 FakeSSLClientSocket::NumBytesRead() const {
-  return transport_socket_->NumBytesRead();
-}
-
-base::TimeDelta FakeSSLClientSocket::GetConnectTimeMicros() const {
-  return transport_socket_->GetConnectTimeMicros();
-}
-
 bool FakeSSLClientSocket::WasNpnNegotiated() const {
   return transport_socket_->WasNpnNegotiated();
 }
diff --git a/jingle/glue/fake_ssl_client_socket.h b/jingle/glue/fake_ssl_client_socket.h
index edd3267..f92aa76 100644
--- a/jingle/glue/fake_ssl_client_socket.h
+++ b/jingle/glue/fake_ssl_client_socket.h
@@ -63,8 +63,6 @@ class FakeSSLClientSocket : public net::StreamSocket {
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual int64 NumBytesRead() const OVERRIDE;
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index 1ed235b..a1e987a 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -373,20 +373,6 @@ bool ProxyResolvingClientSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 ProxyResolvingClientSocket::NumBytesRead() const {
-  if (transport_.get() && transport_->socket())
-    return transport_->socket()->NumBytesRead();
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta ProxyResolvingClientSocket::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket())
-    return transport_->socket()->GetConnectTimeMicros();
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool ProxyResolvingClientSocket::WasNpnNegotiated() const {
   return false;
 }
diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h
index fee8fbc..5249a8b 100644
--- a/jingle/glue/proxy_resolving_client_socket.h
+++ b/jingle/glue/proxy_resolving_client_socket.h
@@ -65,8 +65,6 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual int64 NumBytesRead() const OVERRIDE;
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
diff --git a/jingle/glue/pseudotcp_adapter.cc b/jingle/glue/pseudotcp_adapter.cc
index 34b697e..58d3406 100644
--- a/jingle/glue/pseudotcp_adapter.cc
+++ b/jingle/glue/pseudotcp_adapter.cc
@@ -563,16 +563,6 @@ bool PseudoTcpAdapter::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 PseudoTcpAdapter::NumBytesRead() const {
-  DCHECK(CalledOnValidThread());
-  return -1;
-}
-
-base::TimeDelta PseudoTcpAdapter::GetConnectTimeMicros() const {
-  DCHECK(CalledOnValidThread());
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool PseudoTcpAdapter::WasNpnNegotiated() const {
   DCHECK(CalledOnValidThread());
   return false;
diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h
index e4e1a54..b8e3957 100644
--- a/jingle/glue/pseudotcp_adapter.h
+++ b/jingle/glue/pseudotcp_adapter.h
@@ -49,8 +49,6 @@ class PseudoTcpAdapter : public net::StreamSocket, base::NonThreadSafe {
   virtual void SetOmniboxSpeculation() OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual int64 NumBytesRead() const OVERRIDE;
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;