Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

net/socket_stream/socket_stream_metrics_unittest.cc

 // Copyright (c) 2009 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 "base/basictypes.h"
 #include "base/histogram.h"
 #include "googleurl/src/gurl.h"
 #include "net/socket_stream/socket_stream_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 24 matching lines @@
 
   SocketStreamMetrics unknown(GURL("unknown://www.example.com/"));
   SocketStreamMetrics ws1(GURL("ws://www.example.com/"));
   SocketStreamMetrics ws2(GURL("ws://www.example.com/"));
   SocketStreamMetrics wss1(GURL("wss://www.example.com/"));
   SocketStreamMetrics wss2(GURL("wss://www.example.com/"));
   SocketStreamMetrics wss3(GURL("wss://www.example.com/"));
 
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ProtocolType", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
 
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
   original.Resize(*histogram);  // Ensure |original| size is same as |sample|.
   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));
 }
 
@@ skipping 12 matching lines @@
     metrics.OnStartConnection();
   for (int i = 0; i < 2; ++i)
     metrics.OnTunnelProxy();
   for (int i = 0; i < 3; ++i)
     metrics.OnSOCKSProxy();
   for (int i = 0; i < 4; ++i)
     metrics.OnSSLConnection();
 
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ConnectionType", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
 
   Histogram::SampleSet sample;
   histogram->SnapshotSample(&sample);
   original.Resize(*histogram);
   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));
 }
@@ skipping 38 matching lines @@
   metrics.OnWrite(2);
   metrics.OnWrite(20);
   metrics.OnWrite(200);
   metrics.OnClose();
 
   Histogram::SampleSet sample;
 
   // ConnectionLatency.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ConnectionLatency", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // ConnectionEstablish.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ConnectionEstablish", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // Duration.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.Duration", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   // We don't check the contents of the histogram as it's time sensitive.
 
   // ReceivedBytes.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ReceivedBytes", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(11, sample.sum() - original_received_bytes);  // 11 bytes read.
 
   // ReceivedCounts.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.ReceivedCounts", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(2, sample.sum() - original_received_counts);  // 2 read requests.
 
   // SentBytes.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.SentBytes", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(222, sample.sum() - original_sent_bytes);  // 222 bytes sent.
 
   // SentCounts.
   ASSERT_TRUE(StatisticsRecorder::FindHistogram(
       "Net.SocketStream.SentCounts", &histogram));
-  EXPECT_EQ(kUmaTargetedHistogramFlag, histogram->flags());
+  EXPECT_EQ(Histogram::kUmaTargetedHistogramFlag, histogram->flags());
   histogram->SnapshotSample(&sample);
   EXPECT_EQ(3, sample.sum() - original_sent_counts);  // 3 write requests.
 }
 
 }  // namespace net