Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

net/socket_stream/socket_stream_metrics.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 "net/socket_stream/socket_stream_metrics.h"
 
 #include <string.h>
 
 #include "base/histogram.h"
 #include "base/time.h"
@@ skipping 65 matching lines @@
                        received_bytes_);
   UMA_HISTOGRAM_COUNTS("Net.SocketStream.ReceivedCounts",
                        received_counts_);
   UMA_HISTOGRAM_COUNTS("Net.SocketStream.SentBytes",
                        sent_bytes_);
   UMA_HISTOGRAM_COUNTS("Net.SocketStream.SentCounts",
                        sent_counts_);
 }
 
 void SocketStreamMetrics::CountProtocolType(ProtocolType protocol_type) {
-  static scoped_refptr<Histogram> counter =
-      LinearHistogram::LinearHistogramFactoryGet(
-          "Net.SocketStream.ProtocolType",
-          0, NUM_PROTOCOL_TYPES, NUM_PROTOCOL_TYPES + 1);
-  counter->SetFlags(kUmaTargetedHistogramFlag);
-  counter->Add(protocol_type);
+  UMA_HISTOGRAM_ENUMERATION("Net.SocketStream.ProtocolType",
+       protocol_type, NUM_PROTOCOL_TYPES);
 }
 
 void SocketStreamMetrics::CountConnectionType(ConnectionType connection_type) {
-  static scoped_refptr<Histogram> counter =
-      LinearHistogram::LinearHistogramFactoryGet(
-          "Net.SocketStream.ConnectionType",
-          1, NUM_CONNECTION_TYPES, NUM_CONNECTION_TYPES + 1);
-  counter->SetFlags(kUmaTargetedHistogramFlag);
-  counter->Add(connection_type);
+  UMA_HISTOGRAM_ENUMERATION("Net.SocketStream.ConnectionType",
+       connection_type, NUM_CONNECTION_TYPES);
 }
 
 
 }  // namespace net