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

58 files changed, 10 insertions, 656 deletions

diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index ba85b4c..caafd38 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -30,7 +30,6 @@
 #include "chrome/common/metrics/variations/uniformity_field_trials.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
-#include "net/socket/client_socket_pool_base.h"
 #include "net/spdy/spdy_session.h"
 #include "ui/base/layout.h"
 
@@ -38,23 +37,9 @@
 #include "net/socket/tcp_client_socket_win.h"
 #endif  // defined(OS_WIN)
 
-namespace {
-
-void SetSocketReusePolicy(int warmest_socket_trial_group,
-                          const int socket_policy[],
-                          int num_groups) {
-  const int* result = std::find(socket_policy, socket_policy + num_groups,
-                                warmest_socket_trial_group);
-  DCHECK_NE(result, socket_policy + num_groups)
-      << "Not a valid socket reuse policy group";
-  net::SetSocketReusePolicy(result - socket_policy);
-}
-
-}  // namespace
-
 ChromeBrowserFieldTrials::ChromeBrowserFieldTrials(
-    const CommandLine& parsed_command_line) :
-        parsed_command_line_(parsed_command_line) {
+    const CommandLine& parsed_command_line)
+    : parsed_command_line_(parsed_command_line) {
 }
 
 ChromeBrowserFieldTrials::~ChromeBrowserFieldTrials() {
@@ -75,7 +60,6 @@ void ChromeBrowserFieldTrials::SetupDesktopFieldTrials(
     PrefService* local_state) {
   prerender::ConfigurePrefetchAndPrerender(parsed_command_line_);
   SpdyFieldTrial();
-  WarmConnectionFieldTrial();
   AutoLaunchChromeFieldTrial();
   gpu_util::InitializeCompositingFieldTrial();
   OmniboxFieldTrial::ActivateStaticTrials();
@@ -125,47 +109,6 @@ void ChromeBrowserFieldTrials::SpdyFieldTrial() {
   trial->AppendGroup("cwndMin10", kSpdyCwndMin10);
 }
 
-// If --socket-reuse-policy is not specified, run an A/B test for choosing the
-// warmest socket.
-void ChromeBrowserFieldTrials::WarmConnectionFieldTrial() {
-  const CommandLine& command_line = parsed_command_line_;
-  if (command_line.HasSwitch(switches::kSocketReusePolicy)) {
-    std::string socket_reuse_policy_str = command_line.GetSwitchValueASCII(
-        switches::kSocketReusePolicy);
-    int policy = -1;
-    base::StringToInt(socket_reuse_policy_str, &policy);
-
-    const int policy_list[] = { 0, 1, 2 };
-    VLOG(1) << "Setting socket_reuse_policy = " << policy;
-    SetSocketReusePolicy(policy, policy_list, arraysize(policy_list));
-    return;
-  }
-
-  const base::FieldTrial::Probability kWarmSocketDivisor = 100;
-  const base::FieldTrial::Probability kWarmSocketProbability = 33;
-
-  // Default value is USE_LAST_ACCESSED_SOCKET.
-  int last_accessed_socket = -1;
-
-  // After January 30, 2013 builds, it will always be in default group.
-  scoped_refptr<base::FieldTrial> warmest_socket_trial(
-      base::FieldTrialList::FactoryGetFieldTrial(
-          "WarmSocketImpact", kWarmSocketDivisor, "last_accessed_socket",
-          2013, 1, 30, &last_accessed_socket));
-
-  const int warmest_socket = warmest_socket_trial->AppendGroup(
-      "warmest_socket", kWarmSocketProbability);
-  const int warm_socket = warmest_socket_trial->AppendGroup(
-      "warm_socket", kWarmSocketProbability);
-
-  const int warmest_socket_trial_group = warmest_socket_trial->group();
-
-  const int policy_list[] = { warmest_socket, warm_socket,
-                              last_accessed_socket };
-  SetSocketReusePolicy(warmest_socket_trial_group, policy_list,
-                       arraysize(policy_list));
-}
-
 void ChromeBrowserFieldTrials::AutoLaunchChromeFieldTrial() {
   std::string brand;
   google_util::GetBrand(&brand);
diff --git a/chrome/browser/chrome_browser_field_trials.h b/chrome/browser/chrome_browser_field_trials.h
index bd0cf62..fd66ebd4 100644
--- a/chrome/browser/chrome_browser_field_trials.h
+++ b/chrome/browser/chrome_browser_field_trials.h
@@ -7,7 +7,6 @@
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
-#include "base/gtest_prod_util.h"
 #include "base/time.h"
 
 class PrefService;
@@ -22,11 +21,6 @@ class ChromeBrowserFieldTrials {
   void SetupFieldTrials(PrefService* local_state);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest,
-                           WarmConnectionFieldTrial_WarmestSocket);
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Random);
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
-
   // Sets up common desktop-only field trials.
   // Add an invocation of your field trial init function to this method, or to
   // SetupFieldTrials if it is for all platforms.
@@ -41,9 +35,6 @@ class ChromeBrowserFieldTrials {
   // A/B test for spdy when --use-spdy not set.
   void SpdyFieldTrial();
 
-  // A/B test for warmest socket vs. most recently used socket.
-  void WarmConnectionFieldTrial();
-
   // Field trial to see what disabling DNS pre-resolution does to
   // latency of page loads.
   void PredictorFieldTrial();
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index ae96303..cb66362 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -6,9 +6,7 @@
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 
 #include "base/basictypes.h"
-#include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/chrome_browser_field_trials.h"
@@ -199,11 +197,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // network stack, as this can only be done once.
   static bool disable_enforcing_cookie_policies_for_tests_;
 
-  friend class BrowserMainTest;
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest,
-                           WarmConnectionFieldTrial_WarmestSocket);
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Random);
-  FRIEND_TEST_ALL_PREFIXES(BrowserMainTest, WarmConnectionFieldTrial_Invalid);
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };
 
diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc
deleted file mode 100644
index 44a80f0..0000000
--- a/chrome/browser/chrome_browser_main_unittest.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2012 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 <string>
-#include <vector>
-#include "base/command_line.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
-#include "base/prefs/testing_pref_service.h"
-#include "chrome/browser/chrome_browser_main.h"
-#include "chrome/browser/chrome_content_browser_client.h"
-#include "chrome/common/chrome_switches.h"
-#include "content/public/browser/content_browser_client.h"
-#include "content/public/common/main_function_params.h"
-#include "net/socket/client_socket_pool_base.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-class BrowserMainTest : public testing::Test {
- public:
-  BrowserMainTest()
-      : command_line_(CommandLine::NO_PROGRAM) {
-    ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = true;
-  }
-
- protected:
-  CommandLine command_line_;
-};
-
-TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
-  command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0");
-
-  scoped_ptr<content::MainFunctionParams> params(
-      new content::MainFunctionParams(command_line_));
-  scoped_ptr<content::BrowserMainParts> browser_main_parts(
-      content::GetContentClient()->browser()->CreateBrowserMainParts(*params));
-  ChromeBrowserMainParts* chrome_main_parts =
-      static_cast<ChromeBrowserMainParts*>(browser_main_parts.get());
-  EXPECT_TRUE(chrome_main_parts);
-  if (chrome_main_parts) {
-    base::FieldTrialList field_trial_list_(NULL);
-    chrome_main_parts->browser_field_trials_.WarmConnectionFieldTrial();
-    EXPECT_EQ(0, net::GetSocketReusePolicy());
-  }
-}
-
-TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) {
-  scoped_ptr<content::MainFunctionParams> params(
-      new content::MainFunctionParams(command_line_));
-  scoped_ptr<content::BrowserMainParts> browser_main_parts(
-      content::GetContentClient()->browser()->CreateBrowserMainParts(*params));
-  ChromeBrowserMainParts* chrome_main_parts =
-      static_cast<ChromeBrowserMainParts*>(browser_main_parts.get());
-  EXPECT_TRUE(chrome_main_parts);
-  if (chrome_main_parts) {
-    const int kNumRuns = 1000;
-    for (int i = 0; i < kNumRuns; i++) {
-      base::FieldTrialList field_trial_list_(NULL);
-      chrome_main_parts->browser_field_trials_.WarmConnectionFieldTrial();
-      int val = net::GetSocketReusePolicy();
-      EXPECT_LE(val, 2);
-      EXPECT_GE(val, 0);
-    }
-  }
-}
-
-#if GTEST_HAS_DEATH_TEST
-TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) {
-  command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100");
-
-  scoped_ptr<content::MainFunctionParams> params(
-      new content::MainFunctionParams(command_line_));
-  // This test ends up launching a new process, and that doesn't initialize the
-  // ContentClient interfaces.
-  scoped_ptr<content::BrowserMainParts> browser_main_parts;
-  if (content::GetContentClient()) {
-    browser_main_parts.reset(content::GetContentClient()->browser()->
-                                 CreateBrowserMainParts(*params));
-  } else {
-    chrome::ChromeContentBrowserClient client;
-    browser_main_parts.reset(client.CreateBrowserMainParts(*params));
-  }
-  ChromeBrowserMainParts* parts =
-      static_cast<ChromeBrowserMainParts*>(browser_main_parts.get());
-  EXPECT_TRUE(parts);
-  if (parts) {
-#if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
-    EXPECT_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(),
-                 "Not a valid socket reuse policy group");
-#else
-    EXPECT_DEBUG_DEATH(parts->browser_field_trials_.WarmConnectionFieldTrial(),
-                       "Not a valid socket reuse policy group");
-#endif
-  }
-}
-#endif
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e370914..c77eaa9 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -520,7 +520,6 @@
         'browser/captive_portal/testing_utils.cc',
         'browser/captive_portal/testing_utils.h',
         'browser/chrome_browser_application_mac_unittest.mm',
-        'browser/chrome_browser_main_unittest.cc',
         'browser/chrome_page_zoom_unittest.cc',
         'browser/chromeos/accessibility/magnification_manager_unittest.cc',
         'browser/chromeos/contacts/contact_database_unittest.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6f007df..6e6438e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1271,10 +1271,6 @@ const char kSimulateOutdated[]               = "simulate-outdated";
 // Replaces the buffered data source for <audio> and <video> with a simplified
 // resource loader that downloads the entire resource into memory.
 
-// Socket reuse policy. The value should be of type enum
-// ClientSocketReusePolicy.
-const char kSocketReusePolicy[]             = "socket-reuse-policy";
-
 // Origin for which SpdyProxy authentication is supported.
 const char kSpdyProxyAuthOrigin[]           = "spdy-proxy-auth-origin";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1974c43..32221c9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -336,7 +336,6 @@ extern const char kSilentDumpOnDCHECK[];
 extern const char kSimulateUpgrade[];
 extern const char kSimulateCriticalUpdate[];
 extern const char kSimulateOutdated[];
-extern const char kSocketReusePolicy[];
 extern const char kSpeculativeResourcePrefetching[];
 extern const char kSpeculativeResourcePrefetchingDisabled[];
 extern const char kSpeculativeResourcePrefetchingLearning[];
diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h
index c3deea8..86c7414 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.h
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h
@@ -73,8 +73,6 @@ class FakeSocket : 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;
@@ -213,14 +211,6 @@ bool FakeSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 FakeSocket::NumBytesRead() const {
-  return -1;
-}
-
-base::TimeDelta FakeSocket::GetConnectTimeMicros() const {
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool FakeSocket::WasNpnNegotiated() const {
   return false;
 }
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;
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc
index d1cb35a..76ec06a 100644
--- a/net/http/http_basic_stream.cc
+++ b/net/http/http_basic_stream.cc
@@ -4,8 +4,6 @@
 
 #include "net/http/http_basic_stream.h"
 
-#include "base/format_macros.h"
-#include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
@@ -15,7 +13,6 @@
 #include "net/http/http_stream_parser.h"
 #include "net/http/http_util.h"
 #include "net/socket/client_socket_handle.h"
-#include "net/socket/client_socket_pool_base.h"
 
 namespace net {
 
@@ -26,9 +23,7 @@ HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection,
       parser_(parser),
       connection_(connection),
       using_proxy_(using_proxy),
-      request_info_(NULL),
-      response_(NULL),
-      bytes_read_offset_(0) {
+      request_info_(NULL) {
 }
 
 HttpBasicStream::~HttpBasicStream() {}
@@ -42,7 +37,6 @@ int HttpBasicStream::InitializeStream(
   request_info_ = request_info;
   parser_.reset(new HttpStreamParser(connection_.get(), request_info,
                                      read_buf_, net_log));
-  bytes_read_offset_ = connection_->socket()->NumBytesRead();
   return OK;
 }
 
@@ -58,7 +52,6 @@ int HttpBasicStream::SendRequest(const HttpRequestHeaders& headers,
   request_line_ = base::StringPrintf("%s %s HTTP/1.1\r\n",
                                      request_info_->method.c_str(),
                                      path.c_str());
-  response_ = response;
   return parser_->SendRequest(request_line_, headers, response, callback);
 }
 
@@ -128,10 +121,6 @@ bool HttpBasicStream::IsSpdyHttpStream() const {
   return false;
 }
 
-void HttpBasicStream::LogNumRttVsBytesMetrics() const {
-  // Log rtt metrics here.
-}
-
 void HttpBasicStream::Drain(HttpNetworkSession* session) {
   HttpResponseBodyDrainer* drainer = new HttpResponseBodyDrainer(this);
   drainer->Start(session);
diff --git a/net/http/http_basic_stream.h b/net/http/http_basic_stream.h
index ff2e15c..2d4bb65 100644
--- a/net/http/http_basic_stream.h
+++ b/net/http/http_basic_stream.h
@@ -79,8 +79,6 @@ class HttpBasicStream : public HttpStream {
 
   virtual bool IsSpdyHttpStream() const OVERRIDE;
 
-  virtual void LogNumRttVsBytesMetrics() const OVERRIDE;
-
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
 
  private:
@@ -96,10 +94,6 @@ class HttpBasicStream : public HttpStream {
 
   const HttpRequestInfo* request_info_;
 
-  const HttpResponseInfo* response_;
-
-  int64 bytes_read_offset_;
-
   DISALLOW_COPY_AND_ASSIGN(HttpBasicStream);
 };
 
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 3c2596d..54d79f3 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -990,8 +990,6 @@ int HttpNetworkTransaction::DoReadBodyComplete(int result) {
   // Clean up connection if we are done.
   if (done) {
     LogTransactionMetrics();
-    // TODO(bashi): This cast is temporary. Remove later.
-    static_cast<HttpStream*>(stream_.get())->LogNumRttVsBytesMetrics();
     stream_->Close(!keep_alive);
     // Note: we don't reset the stream here.  We've closed it, but we still
     // need it around so that callers can call methods such as
diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
index 4e8d867..3f81030 100644
--- a/net/http/http_network_transaction_spdy2_unittest.cc
+++ b/net/http/http_network_transaction_spdy2_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/net/http/http_network_transaction_spdy3_unittest.cc b/net/http/http_network_transaction_spdy3_unittest.cc
index e378270..3076326 100644
--- a/net/http/http_network_transaction_spdy3_unittest.cc
+++ b/net/http/http_network_transaction_spdy3_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/files/file_path.h"
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
diff --git a/net/http/http_pipelined_stream.cc b/net/http/http_pipelined_stream.cc
index 863739a..23154dd 100644
--- a/net/http/http_pipelined_stream.cc
+++ b/net/http/http_pipelined_stream.cc
@@ -117,10 +117,6 @@ bool HttpPipelinedStream::IsSpdyHttpStream() const {
   return false;
 }
 
-void HttpPipelinedStream::LogNumRttVsBytesMetrics() const {
-  // TODO(simonjam): I don't want to copy & paste this from http_basic_stream.
-}
-
 void HttpPipelinedStream::Drain(HttpNetworkSession* session) {
   pipeline_->Drain(this, session);
 }
diff --git a/net/http/http_pipelined_stream.h b/net/http/http_pipelined_stream.h
index f02ed9d..675d8f0 100644
--- a/net/http/http_pipelined_stream.h
+++ b/net/http/http_pipelined_stream.h
@@ -79,8 +79,6 @@ class HttpPipelinedStream : public HttpStream {
 
   virtual bool IsSpdyHttpStream() const OVERRIDE;
 
-  virtual void LogNumRttVsBytesMetrics() const OVERRIDE;
-
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
 
   // The SSLConfig used to establish this stream's pipeline.
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 83c10ed..bb89f85 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -184,22 +184,6 @@ bool HttpProxyClientSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 HttpProxyClientSocket::NumBytesRead() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->NumBytesRead();
-  }
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta HttpProxyClientSocket::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->GetConnectTimeMicros();
-  }
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool HttpProxyClientSocket::WasNpnNegotiated() const {
   if (transport_.get() && transport_->socket()) {
     return transport_->socket()->WasNpnNegotiated();
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index 24db3f8..6cab666 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -70,8 +70,6 @@ class HttpProxyClientSocket : public ProxyClientSocket {
   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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc
index d34bb5d..6862804 100644
--- a/net/http/http_response_body_drainer_unittest.cc
+++ b/net/http/http_response_body_drainer_unittest.cc
@@ -122,8 +122,6 @@ class MockHttpStream : public HttpStream {
 
   virtual bool IsSpdyHttpStream() const OVERRIDE { return false; }
 
-  virtual void LogNumRttVsBytesMetrics() const OVERRIDE {}
-
   virtual bool GetLoadTimingInfo(
       LoadTimingInfo* load_timing_info) const OVERRIDE { return false; }
 
diff --git a/net/http/http_stream.h b/net/http/http_stream.h
index 0296e23..3680db3 100644
--- a/net/http/http_stream.h
+++ b/net/http/http_stream.h
@@ -36,10 +36,6 @@ class NET_EXPORT_PRIVATE HttpStream : public HttpStreamBase {
   // subclass does not support renewing the stream, NULL is returned.
   virtual HttpStream* RenewStreamForAuth() = 0;
 
-  // Record histogram of number of round trips taken to download the full
-  // response body vs bytes transferred.
-  virtual void LogNumRttVsBytesMetrics() const = 0;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpStream);
 };
diff --git a/net/quic/quic_http_stream.h b/net/quic/quic_http_stream.h
index bda4aec3..8aa95f0 100644
--- a/net/quic/quic_http_stream.h
+++ b/net/quic/quic_http_stream.h
@@ -52,7 +52,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream :
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual bool IsSpdyHttpStream() const OVERRIDE;
-  virtual void LogNumRttVsBytesMetrics() const OVERRIDE {}
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
 
   // QuicReliableClientStream::Delegate implementation
diff --git a/net/socket/buffered_write_stream_socket.cc b/net/socket/buffered_write_stream_socket.cc
index 3119985..503df86 100644
--- a/net/socket/buffered_write_stream_socket.cc
+++ b/net/socket/buffered_write_stream_socket.cc
@@ -111,14 +111,6 @@ bool BufferedWriteStreamSocket::UsingTCPFastOpen() const {
   return wrapped_socket_->UsingTCPFastOpen();
 }
 
-int64 BufferedWriteStreamSocket::NumBytesRead() const {
-  return wrapped_socket_->NumBytesRead();
-}
-
-base::TimeDelta BufferedWriteStreamSocket::GetConnectTimeMicros() const {
-  return wrapped_socket_->GetConnectTimeMicros();
-}
-
 bool BufferedWriteStreamSocket::WasNpnNegotiated() const {
   return wrapped_socket_->WasNpnNegotiated();
 }
diff --git a/net/socket/buffered_write_stream_socket.h b/net/socket/buffered_write_stream_socket.h
index 5651d2a..fcb33a8 100644
--- a/net/socket/buffered_write_stream_socket.h
+++ b/net/socket/buffered_write_stream_socket.h
@@ -56,8 +56,6 @@ class NET_EXPORT_PRIVATE BufferedWriteStreamSocket : public 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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index fd0fc2f..f3e50f2 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -4,14 +4,12 @@
 
 #include "net/socket/client_socket_pool_base.h"
 
-#include <math.h>
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/stl_util.h"
-#include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
@@ -39,33 +37,10 @@ const int kCleanupInterval = 10;  // DO NOT INCREASE THIS TIMEOUT.
 // after a certain timeout has passed without receiving an ACK.
 bool g_connect_backup_jobs_enabled = true;
 
-double g_socket_reuse_policy_penalty_exponent = -1;
-int g_socket_reuse_policy = -1;
-
 }  // namespace
 
 namespace net {
 
-int GetSocketReusePolicy() {
-  return g_socket_reuse_policy;
-}
-
-void SetSocketReusePolicy(int policy) {
-  DCHECK_GE(policy, 0);
-  DCHECK_LE(policy, 2);
-  if (policy > 2 || policy < 0) {
-    LOG(ERROR) << "Invalid socket reuse policy";
-    return;
-  }
-
-  double exponents[] = { 0, 0.25, -1 };
-  g_socket_reuse_policy_penalty_exponent = exponents[policy];
-  g_socket_reuse_policy = policy;
-
-  VLOG(1) << "Setting g_socket_reuse_policy_penalty_exponent = "
-          << g_socket_reuse_policy_penalty_exponent;
-}
-
 ConnectJob::ConnectJob(const std::string& group_name,
                        base::TimeDelta timeout_duration,
                        Delegate* delegate,
@@ -426,7 +401,6 @@ bool ClientSocketPoolBaseHelper::AssignIdleSocketToRequest(
     const Request* request, Group* group) {
   std::list<IdleSocket>* idle_sockets = group->mutable_idle_sockets();
   std::list<IdleSocket>::iterator idle_socket_it = idle_sockets->end();
-  double max_score = -1;
 
   // Iterate through the idle sockets forwards (oldest to newest)
   //   * Delete any disconnected ones.
@@ -443,22 +417,7 @@ bool ClientSocketPoolBaseHelper::AssignIdleSocketToRequest(
 
     if (it->socket->WasEverUsed()) {
       // We found one we can reuse!
-      double score = 0;
-      int64 bytes_read = it->socket->NumBytesRead();
-      double num_kb = static_cast<double>(bytes_read) / 1024.0;
-      int idle_time_sec = (base::TimeTicks::Now() - it->start_time).InSeconds();
-      idle_time_sec = std::max(1, idle_time_sec);
-
-      if (g_socket_reuse_policy_penalty_exponent >= 0 && num_kb >= 0) {
-        score = num_kb / pow(idle_time_sec,
-                             g_socket_reuse_policy_penalty_exponent);
-      }
-
-      // Equality to prefer recently used connection.
-      if (score >= max_score) {
-        idle_socket_it = it;
-        max_score = score;
-      }
+      idle_socket_it = it;
     }
 
     ++it;
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h
index cbf2f82..8599009 100644
--- a/net/socket/client_socket_pool_base.h
+++ b/net/socket/client_socket_pool_base.h
@@ -51,13 +51,6 @@ namespace net {
 
 class ClientSocketHandle;
 
-// Returns the client socket reuse policy.
-NET_EXPORT_PRIVATE int GetSocketReusePolicy();
-
-// Sets the client socket reuse policy.
-// NOTE: 'policy' should be a valid ClientSocketReusePolicy enum value.
-NET_EXPORT void SetSocketReusePolicy(int policy);
-
 // ConnectJob provides an abstract interface for "connecting" a socket.
 // The connection may involve host resolution, tcp connection, ssl connection,
 // etc.
@@ -161,17 +154,6 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper
     NO_IDLE_SOCKETS = 0x1,  // Do not return an idle socket. Create a new one.
   };
 
-  enum ClientSocketReusePolicy {
-    // Socket with largest amount of bytes transferred.
-    USE_WARMEST_SOCKET = 0,
-
-    // Socket which scores highest on large bytes transferred and low idle time.
-    USE_WARM_SOCKET = 1,
-
-    // Socket which was most recently used.
-    USE_LAST_ACCESSED_SOCKET = 2,
-  };
-
   class NET_EXPORT_PRIVATE Request {
    public:
     Request(ClientSocketHandle* handle,
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 992524e..0628d91 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
-#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
@@ -119,16 +118,14 @@ class MockClientSocket : public StreamSocket {
   explicit MockClientSocket(net::NetLog* net_log)
       : connected_(false),
         net_log_(BoundNetLog::Make(net_log, net::NetLog::SOURCE_SOCKET)),
-        was_used_to_convey_data_(false),
-        num_bytes_read_(0) {
+        was_used_to_convey_data_(false) {
   }
 
   // Socket implementation.
   virtual int Read(
       IOBuffer* /* buf */, int len,
       const CompletionCallback& /* callback */) OVERRIDE {
-    num_bytes_read_ += len;
-    return len;
+    return ERR_UNEXPECTED;
   }
 
   virtual int Write(
@@ -165,15 +162,9 @@ class MockClientSocket : public StreamSocket {
   virtual void SetSubresourceSpeculation() OVERRIDE {}
   virtual void SetOmniboxSpeculation() OVERRIDE {}
   virtual bool WasEverUsed() const OVERRIDE {
-    return was_used_to_convey_data_ || num_bytes_read_ > 0;
+    return was_used_to_convey_data_;
   }
   virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
-  virtual int64 NumBytesRead() const OVERRIDE { return num_bytes_read_; }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    static const base::TimeDelta kDummyConnectTimeMicros =
-        base::TimeDelta::FromMicroseconds(10);
-    return kDummyConnectTimeMicros;  // Dummy value.
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
   }
@@ -188,7 +179,6 @@ class MockClientSocket : public StreamSocket {
   bool connected_;
   BoundNetLog net_log_;
   bool was_used_to_convey_data_;
-  int num_bytes_read_;
 
   DISALLOW_COPY_AND_ASSIGN(MockClientSocket);
 };
@@ -745,71 +735,6 @@ class ClientSocketPoolBaseTest : public testing::Test {
   ClientSocketPoolTest test_base_;
 };
 
-TEST_F(ClientSocketPoolBaseTest, AssignIdleSocketToGroup_WarmestSocket) {
-  CreatePool(4, 4);
-  net::SetSocketReusePolicy(0);
-
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-
-  std::map<int, StreamSocket*> sockets_;
-  for (size_t i = 0; i < test_base_.requests_size(); i++) {
-    TestSocketRequest* req = test_base_.request(i);
-    StreamSocket* s = req->handle()->socket();
-    MockClientSocket* sock = static_cast<MockClientSocket*>(s);
-    CHECK(sock);
-    sockets_[i] = sock;
-    sock->Read(NULL, 1024 - i, CompletionCallback());
-  }
-
-  ReleaseAllConnections(ClientSocketPoolTest::KEEP_ALIVE);
-
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  TestSocketRequest* req = test_base_.request(test_base_.requests_size() - 1);
-
-  // First socket is warmest.
-  EXPECT_EQ(sockets_[0], req->handle()->socket());
-
-  // Test that NumBytes are as expected.
-  EXPECT_EQ(1024, sockets_[0]->NumBytesRead());
-  EXPECT_EQ(1023, sockets_[1]->NumBytesRead());
-  EXPECT_EQ(1022, sockets_[2]->NumBytesRead());
-  EXPECT_EQ(1021, sockets_[3]->NumBytesRead());
-
-  ReleaseAllConnections(ClientSocketPoolTest::NO_KEEP_ALIVE);
-}
-
-TEST_F(ClientSocketPoolBaseTest, AssignIdleSocketToGroup_LastAccessedSocket) {
-  CreatePool(4, 4);
-  net::SetSocketReusePolicy(2);
-
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-
-  std::map<int, StreamSocket*> sockets_;
-  for (size_t i = 0; i < test_base_.requests_size(); i++) {
-    TestSocketRequest* req = test_base_.request(i);
-    StreamSocket* s = req->handle()->socket();
-    MockClientSocket* sock = static_cast<MockClientSocket*>(s);
-    CHECK(sock);
-    sockets_[i] = sock;
-    sock->Read(NULL, 1024 - i, CompletionCallback());
-  }
-
-  ReleaseAllConnections(ClientSocketPoolTest::KEEP_ALIVE);
-
-  EXPECT_EQ(OK, StartRequest("a", kDefaultPriority));
-  TestSocketRequest* req = test_base_.request(test_base_.requests_size() - 1);
-
-  // Last socket is most recently accessed.
-  EXPECT_EQ(sockets_[3], req->handle()->socket());
-  ReleaseAllConnections(ClientSocketPoolTest::NO_KEEP_ALIVE);
-}
-
 // Even though a timeout is specified, it doesn't time out on a synchronous
 // completion.
 TEST_F(ClientSocketPoolBaseTest, ConnectJob_NoTimeoutOnSynchronousCompletion) {
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index adcff26b..da0bf5d 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -792,7 +792,6 @@ MockTCPClientSocket::MockTCPClientSocket(const AddressList& addresses,
       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 @@ 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;
-}
-
 bool MockTCPClientSocket::WasNpnNegotiated() const {
   return false;
 }
@@ -963,7 +951,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;
@@ -1112,14 +1099,6 @@ bool DeterministicMockTCPClientSocket::UsingTCPFastOpen() const {
   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 @@ bool MockSSLClientSocket::UsingTCPFastOpen() const {
   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;
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h
index 4ee958e..df30d23 100644
--- a/net/socket/socket_test_util.h
+++ b/net/socket/socket_test_util.h
@@ -665,8 +665,6 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
   virtual int GetPeerAddress(IPEndPoint* address) const 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 bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
@@ -680,7 +678,6 @@ class MockTCPClientSocket : public MockClientSocket, public AsyncSocket {
 
   SocketDataProvider* data_;
   int read_offset_;
-  int num_bytes_read_;
   MockRead read_data_;
   bool need_read_data_;
 
@@ -725,8 +722,6 @@ class DeterministicMockTCPClientSocket
   virtual bool IsConnectedAndIdle() const 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 bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
@@ -769,9 +764,7 @@ class MockSSLClientSocket : public MockClientSocket, public AsyncSocket {
   virtual bool IsConnected() const OVERRIDE;
   virtual bool WasEverUsed() const OVERRIDE;
   virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual int64 NumBytesRead() const OVERRIDE;
   virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index 409968c..8a1b256 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -142,22 +142,6 @@ bool SOCKS5ClientSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 SOCKS5ClientSocket::NumBytesRead() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->NumBytesRead();
-  }
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta SOCKS5ClientSocket::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->GetConnectTimeMicros();
-  }
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool SOCKS5ClientSocket::WasNpnNegotiated() const {
   if (transport_.get() && transport_->socket()) {
     return transport_->socket()->WasNpnNegotiated();
diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h
index cf6a484..f168636 100644
--- a/net/socket/socks5_client_socket.h
+++ b/net/socket/socks5_client_socket.h
@@ -59,8 +59,6 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public 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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 16ef3bd..54bc7dc 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -164,22 +164,6 @@ bool SOCKSClientSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 SOCKSClientSocket::NumBytesRead() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->NumBytesRead();
-  }
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta SOCKSClientSocket::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->GetConnectTimeMicros();
-  }
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool SOCKSClientSocket::WasNpnNegotiated() const {
   if (transport_.get() && transport_->socket()) {
     return transport_->socket()->WasNpnNegotiated();
diff --git a/net/socket/socks_client_socket.h b/net/socket/socks_client_socket.h
index 17d3ca6..3d4f9fc 100644
--- a/net/socket/socks_client_socket.h
+++ b/net/socket/socks_client_socket.h
@@ -56,8 +56,6 @@ class NET_EXPORT_PRIVATE SOCKSClientSocket : public 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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 24fa8d3..0ac5a83 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -3033,22 +3033,6 @@ bool SSLClientSocketNSS::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 SSLClientSocketNSS::NumBytesRead() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->NumBytesRead();
-  }
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta SSLClientSocketNSS::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket()) {
-    return transport_->socket()->GetConnectTimeMicros();
-  }
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
                              const CompletionCallback& callback) {
   DCHECK(core_);
diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
index 3c9434b..fe459ea 100644
--- a/net/socket/ssl_client_socket_nss.h
+++ b/net/socket/ssl_client_socket_nss.h
@@ -91,8 +91,6 @@ class SSLClientSocketNSS : public SSLClientSocket {
   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 GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Socket implementation.
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 482c500..b445cb6 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -1257,22 +1257,6 @@ bool SSLClientSocketOpenSSL::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 SSLClientSocketOpenSSL::NumBytesRead() const {
-  if (transport_.get() && transport_->socket())
-    return transport_->socket()->NumBytesRead();
-
-  NOTREACHED();
-  return -1;
-}
-
-base::TimeDelta SSLClientSocketOpenSSL::GetConnectTimeMicros() const {
-  if (transport_.get() && transport_->socket())
-    return transport_->socket()->GetConnectTimeMicros();
-
-  NOTREACHED();
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 // Socket methods
 
 int SSLClientSocketOpenSSL::Read(IOBuffer* buf,
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h
index e17aca7..f82d721 100644
--- a/net/socket/ssl_client_socket_openssl.h
+++ b/net/socket/ssl_client_socket_openssl.h
@@ -86,8 +86,6 @@ class SSLClientSocketOpenSSL : public SSLClientSocket {
   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 GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
 
   // Socket implementation.
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index aa1252c..7999455 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -87,12 +87,6 @@ class ReadBufferingStreamSocket : public net::StreamSocket {
   virtual bool UsingTCPFastOpen() const OVERRIDE {
     return transport_->UsingTCPFastOpen();
   }
-  virtual int64 NumBytesRead() const OVERRIDE {
-    return transport_->NumBytesRead();
-  }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    return transport_->GetConnectTimeMicros();
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return transport_->WasNpnNegotiated();
   }
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index 29c036a..658aff7 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -293,14 +293,6 @@ bool SSLServerSocketNSS::UsingTCPFastOpen() const {
   return transport_socket_->UsingTCPFastOpen();
 }
 
-int64 SSLServerSocketNSS::NumBytesRead() const {
-  return transport_socket_->NumBytesRead();
-}
-
-base::TimeDelta SSLServerSocketNSS::GetConnectTimeMicros() const {
-  return transport_socket_->GetConnectTimeMicros();
-}
-
 bool SSLServerSocketNSS::WasNpnNegotiated() const {
   return false;
 }
diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h
index a9197c1..17a1fc3 100644
--- a/net/socket/ssl_server_socket_nss.h
+++ b/net/socket/ssl_server_socket_nss.h
@@ -61,8 +61,6 @@ class SSLServerSocketNSS : public SSLServerSocket {
   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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index 9f43910..6c77682 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -229,13 +229,6 @@ class FakeSocket : public StreamSocket {
     return false;
   }
 
-  virtual int64 NumBytesRead() const OVERRIDE {
-    return -1;
-  }
-
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    return base::TimeDelta::FromMicroseconds(-1);
-  }
 
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
diff --git a/net/socket/stream_socket.h b/net/socket/stream_socket.h
index 9193389..38eec86 100644
--- a/net/socket/stream_socket.h
+++ b/net/socket/stream_socket.h
@@ -5,7 +5,6 @@
 #ifndef NET_SOCKET_STREAM_SOCKET_H_
 #define NET_SOCKET_STREAM_SOCKET_H_
 
-#include "base/time.h"
 #include "net/base/net_log.h"
 #include "net/socket/next_proto.h"
 #include "net/socket/socket.h"
@@ -80,12 +79,6 @@ class NET_EXPORT_PRIVATE StreamSocket : public Socket {
   // TCP FastOpen is an experiment with sending data in the TCP SYN packet.
   virtual bool UsingTCPFastOpen() const = 0;
 
-  // Returns the number of bytes successfully read from this socket.
-  virtual int64 NumBytesRead() const = 0;
-
-  // Returns the connection setup time of this socket.
-  virtual base::TimeDelta GetConnectTimeMicros() const = 0;
-
   // Returns true if NPN was negotiated during the connection of this socket.
   virtual bool WasNpnNegotiated() const = 0;
 
diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc
index 564d439..e045e89 100644
--- a/net/socket/tcp_client_socket_libevent.cc
+++ b/net/socket/tcp_client_socket_libevent.cc
@@ -137,8 +137,7 @@ TCPClientSocketLibevent::TCPClientSocketLibevent(
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
       previously_disconnected_(false),
       use_tcp_fastopen_(IsTCPFastOpenEnabled()),
-      tcp_fastopen_connected_(false),
-      num_bytes_read_(0) {
+      tcp_fastopen_connected_(false) {
   net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
                       source.ToEventParametersCallback());
 }
@@ -294,7 +293,6 @@ int TCPClientSocketLibevent::DoConnect() {
     if (!endpoint.ToSockAddr(storage.addr, &storage.addr_len))
       return ERR_INVALID_ARGUMENT;
 
-    connect_start_time_ = base::TimeTicks::Now();
     if (!HANDLE_EINTR(connect(socket_, storage.addr, storage.addr_len))) {
       // Connected without waiting!
       return OK;
@@ -335,7 +333,6 @@ int TCPClientSocketLibevent::DoConnectComplete(int result) {
   }
 
   if (result == OK) {
-    connect_time_micros_ = base::TimeTicks::Now() - connect_start_time_;
     write_socket_watcher_.StopWatchingFileDescriptor();
     use_history_.set_was_ever_connected();
     return OK;  // Done!
@@ -439,7 +436,6 @@ int TCPClientSocketLibevent::Read(IOBuffer* buf,
   if (nread >= 0) {
     base::StatsCounter read_bytes("tcp.read_bytes");
     read_bytes.Add(nread);
-    num_bytes_read_ += static_cast<int64>(nread);
     if (nread > 0)
       use_history_.set_was_used_to_convey_data();
     net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, nread,
@@ -668,7 +664,6 @@ void TCPClientSocketLibevent::DidCompleteRead() {
     result = bytes_transferred;
     base::StatsCounter read_bytes("tcp.read_bytes");
     read_bytes.Add(bytes_transferred);
-    num_bytes_read_ += static_cast<int64>(bytes_transferred);
     if (bytes_transferred > 0)
       use_history_.set_was_used_to_convey_data();
     net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, result,
@@ -769,14 +764,6 @@ bool TCPClientSocketLibevent::UsingTCPFastOpen() const {
   return use_tcp_fastopen_;
 }
 
-int64 TCPClientSocketLibevent::NumBytesRead() const {
-  return num_bytes_read_;
-}
-
-base::TimeDelta TCPClientSocketLibevent::GetConnectTimeMicros() const {
-  return connect_time_micros_;
-}
-
 bool TCPClientSocketLibevent::WasNpnNegotiated() const {
   return false;
 }
diff --git a/net/socket/tcp_client_socket_libevent.h b/net/socket/tcp_client_socket_libevent.h
index c05877e..2ac1d6d 100644
--- a/net/socket/tcp_client_socket_libevent.h
+++ b/net/socket/tcp_client_socket_libevent.h
@@ -53,8 +53,6 @@ class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public 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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
@@ -196,10 +194,6 @@ class NET_EXPORT_PRIVATE TCPClientSocketLibevent : public StreamSocket,
   // True when TCP FastOpen is in use and we have done the connect.
   bool tcp_fastopen_connected_;
 
-  base::TimeTicks connect_start_time_;
-  base::TimeDelta connect_time_micros_;
-  int64 num_bytes_read_;
-
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocketLibevent);
 };
 
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index a39cd71..f3548ab 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -343,8 +343,7 @@ TCPClientSocketWin::TCPClientSocketWin(const AddressList& addresses,
       next_connect_state_(CONNECT_STATE_NONE),
       connect_os_error_(0),
       net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)),
-      previously_disconnected_(false),
-      num_bytes_read_(0) {
+      previously_disconnected_(false) {
   net_log_.BeginEvent(NetLog::TYPE_SOCKET_ALIVE,
                       source.ToEventParametersCallback());
   EnsureWinsockInit();
@@ -501,7 +500,6 @@ int TCPClientSocketWin::DoConnect() {
   SockaddrStorage storage;
   if (!endpoint.ToSockAddr(storage.addr, &storage.addr_len))
     return ERR_INVALID_ARGUMENT;
-  connect_start_time_ = base::TimeTicks::Now();
   if (!connect(socket_, storage.addr, storage.addr_len)) {
     // Connected without waiting!
     //
@@ -542,7 +540,6 @@ int TCPClientSocketWin::DoConnectComplete(int result) {
   }
 
   if (result == OK) {
-    connect_time_micros_ = base::TimeTicks::Now() - connect_start_time_;
     use_history_.set_was_ever_connected();
     return OK;  // Done!
   }
@@ -693,14 +690,6 @@ bool TCPClientSocketWin::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 TCPClientSocketWin::NumBytesRead() const {
-  return num_bytes_read_;
-}
-
-base::TimeDelta TCPClientSocketWin::GetConnectTimeMicros() const {
-  return connect_time_micros_;
-}
-
 bool TCPClientSocketWin::WasNpnNegotiated() const {
   return false;
 }
@@ -854,7 +843,6 @@ int TCPClientSocketWin::DoRead(IOBuffer* buf, int buf_len,
       if (rv > 0) {
         use_history_.set_was_used_to_convey_data();
         read_bytes.Add(rv);
-        num_bytes_read_ += rv;
       }
       net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, rv,
                                     buf->data());
@@ -879,7 +867,6 @@ int TCPClientSocketWin::DoRead(IOBuffer* buf, int buf_len,
         if (num > 0) {
           use_history_.set_was_used_to_convey_data();
           read_bytes.Add(num);
-          num_bytes_read_ += num;
         }
         net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED, num,
                                       buf->data());
@@ -962,7 +949,6 @@ void TCPClientSocketWin::DidCompleteRead() {
   if (ok) {
     base::StatsCounter read_bytes("tcp.read_bytes");
     read_bytes.Add(num_bytes);
-    num_bytes_read_ += num_bytes;
     if (num_bytes > 0)
       use_history_.set_was_used_to_convey_data();
     net_log_.AddByteTransferEvent(NetLog::TYPE_SOCKET_BYTES_RECEIVED,
diff --git a/net/socket/tcp_client_socket_win.h b/net/socket/tcp_client_socket_win.h
index cd7d455..26c8b9f 100644
--- a/net/socket/tcp_client_socket_win.h
+++ b/net/socket/tcp_client_socket_win.h
@@ -52,8 +52,6 @@ class NET_EXPORT TCPClientSocketWin : public StreamSocket,
   virtual void SetOmniboxSpeculation();
   virtual bool WasEverUsed() const;
   virtual bool UsingTCPFastOpen() const;
-  virtual int64 NumBytesRead() const;
-  virtual base::TimeDelta GetConnectTimeMicros() const;
   virtual bool WasNpnNegotiated() const OVERRIDE;
   virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
@@ -156,10 +154,6 @@ class NET_EXPORT TCPClientSocketWin : public StreamSocket,
   // histograms.
   UseHistory use_history_;
 
-  base::TimeTicks connect_start_time_;
-  base::TimeDelta connect_time_micros_;
-  int64 num_bytes_read_;
-
   DISALLOW_COPY_AND_ASSIGN(TCPClientSocketWin);
 };
 
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index ffea811..eba7c26 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -125,10 +125,6 @@ class MockClientSocket : public StreamSocket {
   virtual void SetOmniboxSpeculation() OVERRIDE {}
   virtual bool WasEverUsed() const OVERRIDE { return false; }
   virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
-  virtual int64 NumBytesRead() const OVERRIDE { return -1; }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    return base::TimeDelta::FromMicroseconds(-1);
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
   }
@@ -191,10 +187,6 @@ class MockFailingClientSocket : public StreamSocket {
   virtual void SetOmniboxSpeculation() OVERRIDE {}
   virtual bool WasEverUsed() const OVERRIDE { return false; }
   virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
-  virtual int64 NumBytesRead() const OVERRIDE { return -1; }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    return base::TimeDelta::FromMicroseconds(-1);
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
   }
@@ -282,10 +274,6 @@ class MockPendingClientSocket : public StreamSocket {
   virtual void SetOmniboxSpeculation() OVERRIDE {}
   virtual bool WasEverUsed() const OVERRIDE { return false; }
   virtual bool UsingTCPFastOpen() const OVERRIDE { return false; }
-  virtual int64 NumBytesRead() const OVERRIDE { return -1; }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    return base::TimeDelta::FromMicroseconds(-1);
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
   }
diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc
index 6bf9d28..5b85690 100644
--- a/net/socket/transport_client_socket_unittest.cc
+++ b/net/socket/transport_client_socket_unittest.cc
@@ -290,8 +290,6 @@ TEST_P(TransportClientSocketTest, Read) {
 
   rv = sock_->Read(buf, 4096, callback.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
-  EXPECT_EQ(static_cast<int64>(std::string(kServerReply).size()),
-            sock_->NumBytesRead());
   CloseServerSocket();
   EXPECT_EQ(0, callback.WaitForResult());
 }
@@ -324,8 +322,6 @@ TEST_P(TransportClientSocketTest, Read_SmallChunks) {
   // then close the server socket, and note the close.
 
   rv = sock_->Read(buf, 1, callback.callback());
-  EXPECT_EQ(static_cast<int64>(std::string(kServerReply).size()),
-            sock_->NumBytesRead());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   CloseServerSocket();
   EXPECT_EQ(0, callback.WaitForResult());
@@ -346,12 +342,9 @@ TEST_P(TransportClientSocketTest, Read_Interrupted) {
   scoped_refptr<IOBuffer> buf(new IOBuffer(16));
   rv = sock_->Read(buf, 16, callback.callback());
   EXPECT_TRUE(rv >= 0 || rv == ERR_IO_PENDING);
-  EXPECT_EQ(0, sock_->NumBytesRead());
 
-  if (rv == ERR_IO_PENDING) {
+  if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
-    EXPECT_EQ(16, sock_->NumBytesRead());
-  }
 
   EXPECT_NE(0, rv);
 }
diff --git a/net/spdy/spdy_http_stream.h b/net/spdy/spdy_http_stream.h
index 423ec3c..6e11606 100644
--- a/net/spdy/spdy_http_stream.h
+++ b/net/spdy/spdy_http_stream.h
@@ -79,7 +79,6 @@ class NET_EXPORT_PRIVATE SpdyHttpStream : public SpdyStream::Delegate,
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual bool IsSpdyHttpStream() const OVERRIDE;
-  virtual void LogNumRttVsBytesMetrics() const OVERRIDE {}
   virtual void Drain(HttpNetworkSession* session) OVERRIDE;
 
   // SpdyStream::Delegate implementation.
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index 7de80f4..b5b3313 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -173,14 +173,6 @@ bool SpdyProxyClientSocket::UsingTCPFastOpen() const {
   return false;
 }
 
-int64 SpdyProxyClientSocket::NumBytesRead() const {
-  return -1;
-}
-
-base::TimeDelta SpdyProxyClientSocket::GetConnectTimeMicros() const {
-  return base::TimeDelta::FromMicroseconds(-1);
-}
-
 bool SpdyProxyClientSocket::WasNpnNegotiated() const {
   return false;
 }
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index 9f2dccf..3b484a1 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -73,8 +73,6 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
   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 NextProto GetNegotiatedProtocol() const OVERRIDE;
   virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc
index b0a00da..69e48e4 100644
--- a/remoting/protocol/channel_multiplexer.cc
+++ b/remoting/protocol/channel_multiplexer.cc
@@ -164,14 +164,6 @@ class ChannelMultiplexer::MuxSocket : public net::StreamSocket,
   virtual bool UsingTCPFastOpen() const OVERRIDE {
     return false;
   }
-  virtual int64 NumBytesRead() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return 0;
-  }
-  virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE {
-    NOTIMPLEMENTED();
-    return base::TimeDelta();
-  }
   virtual bool WasNpnNegotiated() const OVERRIDE {
     return false;
   }
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc
index ad8d18fe..a659e10 100644
--- a/remoting/protocol/fake_session.cc
+++ b/remoting/protocol/fake_session.cc
@@ -196,16 +196,6 @@ bool FakeSocket::UsingTCPFastOpen() const {
   return true;
 }
 
-int64 FakeSocket::NumBytesRead() const {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-base::TimeDelta FakeSocket::GetConnectTimeMicros() const {
-  NOTIMPLEMENTED();
-  return base::TimeDelta();
-}
-
 bool FakeSocket::WasNpnNegotiated() const {
   return false;
 }
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h
index 1d4519f..2ca9b46 100644
--- a/remoting/protocol/fake_session.h
+++ b/remoting/protocol/fake_session.h
@@ -71,8 +71,6 @@ class FakeSocket : 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;