Refactor of Histogram related code

net/socket_stream/socket_stream_metrics_unittest.cc

 // 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 "net/socket_stream/socket_stream_metrics.h"
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "googleurl/src/gurl.h"
@@ skipping 23 matching lines @@
   SocketStreamMetrics wss2(GURL("wss://www.example.com/"));
   SocketStreamMetrics wss3(GURL("wss://www.example.com/"));
 
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ProtocolType");
   ASSERT_TRUE(histogram != NULL);
   EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
 
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
-  original.Resize(*histogram);  // Ensure |original| size is same as |sample|.
+  original.Resize(histogram->bucket_count());
   sample.Subtract(original);  // Cancel the original values.
   EXPECT_EQ(1, sample.counts(SocketStreamMetrics::PROTOCOL_UNKNOWN));
   EXPECT_EQ(2, sample.counts(SocketStreamMetrics::PROTOCOL_WEBSOCKET));
   EXPECT_EQ(3, sample.counts(SocketStreamMetrics::PROTOCOL_WEBSOCKET_SECURE));
 }
 
 TEST(SocketStreamMetricsTest, ConnectionType) {
   // First we'll preserve the original values.
   Histogram::SampleSet original;
   Histogram* histogram =
@@ skipping 13 matching lines @@
     metrics.OnCountConnectionType(SocketStreamMetrics::SSL_CONNECTION);
 
 
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.ConnectionType");
   ASSERT_TRUE(histogram != NULL);
   EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
 
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
-  original.Resize(*histogram);
+  original.Resize(histogram->bucket_count());
   sample.Subtract(original);
   EXPECT_EQ(1, sample.counts(SocketStreamMetrics::ALL_CONNECTIONS));
   EXPECT_EQ(2, sample.counts(SocketStreamMetrics::TUNNEL_CONNECTION));
   EXPECT_EQ(3, sample.counts(SocketStreamMetrics::SOCKS_CONNECTION));
   EXPECT_EQ(4, sample.counts(SocketStreamMetrics::SSL_CONNECTION));
 }
 
 TEST(SocketStreamMetricsTest, WireProtocolType) {
   // First we'll preserve the original values.
   Histogram::SampleSet original;
@@ skipping 10 matching lines @@
   for (int i = 0; i < 7; ++i)
     metrics.OnCountWireProtocolType(SocketStreamMetrics::WIRE_PROTOCOL_SPDY);
 
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.WireProtocolType");
   ASSERT_TRUE(histogram != NULL);
   EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
 
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
-  original.Resize(*histogram);
+  original.Resize(histogram->bucket_count());
   sample.Subtract(original);
   EXPECT_EQ(3, sample.counts(SocketStreamMetrics::WIRE_PROTOCOL_WEBSOCKET));
   EXPECT_EQ(7, sample.counts(SocketStreamMetrics::WIRE_PROTOCOL_SPDY));
 }
 
 TEST(SocketStreamMetricsTest, OtherNumbers) {
   // First we'll preserve the original values.
   int64 original_received_bytes = 0;
   int64 original_received_counts = 0;
   int64 original_sent_bytes = 0;
@@ skipping 87 matching lines @@
   // SentCounts.
   histogram =
       StatisticsRecorder::FindHistogram("Net.SocketStream.SentCounts");
   ASSERT_TRUE(histogram != NULL);
   EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(3, sample.sum() - original_sent_counts);  // 3 write requests.
 }
 
 }  // namespace net