Connect SparseHistogram with the rest of stats system

With this CL, SparseHistogram is usable with SparseHistogram::FactoryGet.
Next step is to implement a Histogram like macro and implement WriteHTMLGraph
and WriteAscii to have a nice output.

BUG=139612


Review URL: https://chromiumcodereview.appspot.com/12207058

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

4 files changed, 24 insertions, 22 deletions

diff --git a/net/disk_cache/stats_histogram.cc b/net/disk_cache/stats_histogram.cc
index 3292a20..7499ab2 100644
--- a/net/disk_cache/stats_histogram.cc
+++ b/net/disk_cache/stats_histogram.cc
@@ -45,7 +45,7 @@ StatsHistogram* StatsHistogram::FactoryGet(const std::string& name,
   Sample minimum = 1;
   Sample maximum = disk_cache::Stats::kDataSizesLength - 1;
   size_t bucket_count = disk_cache::Stats::kDataSizesLength;
-  Histogram* histogram = StatisticsRecorder::FindHistogram(name);
+  HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
   if (!histogram) {
     DCHECK(stats);
 
@@ -83,9 +83,9 @@ scoped_ptr<HistogramSamples> StatsHistogram::SnapshotSamples() const {
   return samples.PassAs<HistogramSamples>();
 }
 
-Histogram::Inconsistencies StatsHistogram::FindCorruption(
-    const HistogramSamples& samples) const {
-  return NO_INCONSISTENCIES;  // This class won't monitor inconsistencies.
+int StatsHistogram::FindCorruption(const HistogramSamples& samples) const {
+  // This class won't monitor inconsistencies.
+  return HistogramBase::NO_INCONSISTENCIES;
 }
 
 }  // namespace disk_cache
diff --git a/net/disk_cache/stats_histogram.h b/net/disk_cache/stats_histogram.h
index 6959622..09a37fd 100644
--- a/net/disk_cache/stats_histogram.h
+++ b/net/disk_cache/stats_histogram.h
@@ -43,7 +43,7 @@ class StatsHistogram : public base::Histogram {
                                     const Stats* stats);
 
   virtual scoped_ptr<base::HistogramSamples> SnapshotSamples() const OVERRIDE;
-  virtual Inconsistencies FindCorruption(
+  virtual int FindCorruption(
       const base::HistogramSamples& samples) const OVERRIDE;
 
  private:
diff --git a/net/socket_stream/socket_stream_metrics_unittest.cc b/net/socket_stream/socket_stream_metrics_unittest.cc
index 76ad495..741acb7 100644
--- a/net/socket_stream/socket_stream_metrics_unittest.cc
+++ b/net/socket_stream/socket_stream_metrics_unittest.cc
@@ -14,6 +14,7 @@
 #include "testing/platform_test.h"
 
 using base::Histogram;
+using base::HistogramBase;
 using base::HistogramSamples;
 using base::StatisticsRecorder;
 
@@ -24,7 +25,7 @@ TEST(SocketStreamMetricsTest, ProtocolType) {
   // as histograms can get affected by other tests. In particular,
   // SocketStreamTest and WebSocketTest can affect the histograms.
   scoped_ptr<HistogramSamples> original;
-  Histogram* histogram =
+  HistogramBase* histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ProtocolType");
   if (histogram) {
     original = histogram->SnapshotSamples();
@@ -40,7 +41,7 @@ TEST(SocketStreamMetricsTest, ProtocolType) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ProtocolType");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
 
   scoped_ptr<HistogramSamples> samples(histogram->SnapshotSamples());
   if (original.get()) {
@@ -55,7 +56,7 @@ TEST(SocketStreamMetricsTest, ProtocolType) {
 TEST(SocketStreamMetricsTest, ConnectionType) {
   // First we'll preserve the original values.
   scoped_ptr<HistogramSamples> original;
-  Histogram* histogram =
+  HistogramBase* histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ConnectionType");
   if (histogram) {
     original = histogram->SnapshotSamples();
@@ -75,7 +76,7 @@ TEST(SocketStreamMetricsTest, ConnectionType) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ConnectionType");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
 
   scoped_ptr<HistogramSamples> samples(histogram->SnapshotSamples());
   if (original.get()) {
@@ -90,7 +91,7 @@ TEST(SocketStreamMetricsTest, ConnectionType) {
 TEST(SocketStreamMetricsTest, WireProtocolType) {
   // First we'll preserve the original values.
   scoped_ptr<HistogramSamples> original;
-  Histogram* histogram =
+  HistogramBase* histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.WireProtocolType");
   if (histogram) {
     original = histogram->SnapshotSamples();
@@ -106,7 +107,7 @@ TEST(SocketStreamMetricsTest, WireProtocolType) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.WireProtocolType");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
 
   scoped_ptr<HistogramSamples> samples(histogram->SnapshotSamples());
   if (original.get()) {
@@ -125,7 +126,7 @@ TEST(SocketStreamMetricsTest, OtherNumbers) {
 
   scoped_ptr<HistogramSamples> original;
 
-  Histogram* histogram =
+  HistogramBase* histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ReceivedBytes");
   if (histogram) {
     original = histogram->SnapshotSamples();
@@ -167,28 +168,28 @@ TEST(SocketStreamMetricsTest, OtherNumbers) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ConnectionLatency");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // ConnectionEstablish.
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ConnectionEstablish");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // Duration.
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.Duration");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // ReceivedBytes.
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ReceivedBytes");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   samples = histogram->SnapshotSamples();
   EXPECT_EQ(11, samples->sum() - original_received_bytes);  // 11 bytes read.
 
@@ -196,7 +197,7 @@ TEST(SocketStreamMetricsTest, OtherNumbers) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ReceivedCounts");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   samples = histogram->SnapshotSamples();
   EXPECT_EQ(2, samples->sum() - original_received_counts);  // 2 read requests.
 
@@ -204,7 +205,7 @@ TEST(SocketStreamMetricsTest, OtherNumbers) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.SentBytes");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   samples = histogram->SnapshotSamples();
   EXPECT_EQ(222, samples->sum() - original_sent_bytes);  // 222 bytes sent.
 
@@ -212,7 +213,7 @@ TEST(SocketStreamMetricsTest, OtherNumbers) {
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.SentCounts");
   ASSERT_TRUE(histogram != NULL);
-  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
   samples = histogram->SnapshotSamples();
   EXPECT_EQ(3, samples->sum() - original_sent_counts);  // 3 write requests.
 }
diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc
index 998fb06..bb010c3 100644
--- a/net/url_request/url_request_throttler_unittest.cc
+++ b/net/url_request/url_request_throttler_unittest.cc
@@ -29,6 +29,7 @@ namespace net {
 namespace {
 
 using base::Histogram;
+using base::HistogramBase;
 using base::HistogramSamples;
 using base::StatisticsRecorder;
 
@@ -211,7 +212,7 @@ void URLRequestThrottlerEntryTest::SetUp() {
     // Must retrieve original samples for each histogram for comparison
     // as other tests may affect them.
     const char* name = kHistogramNames[i];
-    Histogram* histogram = StatisticsRecorder::FindHistogram(name);
+    HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
     if (histogram) {
       original_samples_[name] = histogram->SnapshotSamples().release();
     } else {
@@ -230,9 +231,9 @@ void URLRequestThrottlerEntryTest::CalculateHistogramDeltas() {
     const char* name = kHistogramNames[i];
     HistogramSamples* original = original_samples_[name];
 
-    Histogram* histogram = StatisticsRecorder::FindHistogram(name);
+    HistogramBase* histogram = StatisticsRecorder::FindHistogram(name);
     if (histogram) {
-      ASSERT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
+      ASSERT_EQ(HistogramBase::kUmaTargetedHistogramFlag, histogram->flags());
 
       scoped_ptr<HistogramSamples> samples(histogram->SnapshotSamples());
       if (original)