Remove the ScopedBandwidthMetrics class and associated Net.DownloadBa…

…ndwith metric. Also had to fix a couple missing includes. BUG=469288 Review URL: https://codereview.chromium.org/1045003002 Cr-Commit-Position: refs/heads/master@{#323108}
Denger-Network · Mar 31, 2015 · 2551ddd · 2551ddd
1 parent 4fd3330
commit 2551ddd
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 182 deletions.
diff --git a/net/base/bandwidth_metrics.cc b/net/base/bandwidth_metrics.cc
diff --git a/net/base/bandwidth_metrics.h b/net/base/bandwidth_metrics.h
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"

diff --git a/net/net.gypi b/net/net.gypi
@@ -187,8 +187,6 @@
       'base/address_tracker_linux.h',
       'base/backoff_entry.cc',
       'base/backoff_entry.h',
-      'base/bandwidth_metrics.cc',
-      'base/bandwidth_metrics.h',
       'base/cache_type.h',
       'base/chunked_upload_data_stream.cc',
       'base/chunked_upload_data_stream.h',

diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ -427,8 +428,6 @@ int SpdyStream::OnInitialResponseHeadersReceived(
       break;
   }
 
-  metrics_.StartStream();
-
   DCHECK_NE(io_state_, STATE_IDLE);
 
   response_time_ = response_time;
@@ -477,7 +476,6 @@ void SpdyStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
       pending_recv_data_.push_back(buffer.release());
     } else {
       pending_recv_data_.push_back(NULL);
-      metrics_.StopStream();
       // Note: we leave the stream open in the session until the stream
       //       is claimed.
     }
@@ -496,7 +494,6 @@ void SpdyStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
   CHECK(!IsClosed());
 
   if (!buffer) {
-    metrics_.StopStream();
     if (io_state_ == STATE_OPEN) {
       io_state_ = STATE_HALF_CLOSED_REMOTE;
     } else if (io_state_ == STATE_HALF_CLOSED_LOCAL) {
@@ -518,7 +515,6 @@ void SpdyStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {
   }
 
   // Track our bandwidth.
-  metrics_.RecordBytes(length);
   recv_bytes_ += length;
   recv_last_byte_time_ = base::TimeTicks::Now();
 

diff --git a/net/spdy/spdy_stream.h b/net/spdy/spdy_stream.h
@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "net/base/bandwidth_metrics.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
@@ -508,8 +507,6 @@ class NET_EXPORT_PRIVATE SpdyStream {
   int32 recv_window_size_;
   int32 unacked_recv_window_bytes_;
 
-  ScopedBandwidthMetrics metrics_;
-
   const base::WeakPtr<SpdySession> session_;
 
   // The transaction should own the delegate.

diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -17786,6 +17786,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 </histogram>
 
 <histogram name="Net.DownloadBandwidth">
+  <obsolete>
+    Deprecated as of 03/2015.  No longer generated.
+  </obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>
     Kbps on download streams exceeding 25KB.  Measures from the beginning of the