Cleanup histogram classes mixing SetFlags into FactoryGet arguments...

net/http/http_network_transaction.cc

 // Copyright (c) 2006-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/http/http_network_transaction.h"
 
 #include "base/format_macros.h"
 #include "base/scoped_ptr.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
@@ skipping 1139 matching lines @@
       !FieldTrial::MakeName("", "SocketLateBinding").empty();
 
   if (handle.reuse_type() == ClientSocketHandle::UNUSED) {
     UMA_HISTOGRAM_CLIPPED_TIMES(
         "Net.Dns_Resolution_And_TCP_Connection_Latency",
         time_to_obtain_connected_socket,
         base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
         100);
   }
 
-  static scoped_refptr<Histogram> tcp_socket_type_counter =
-      LinearHistogram::LinearHistogramFactoryGet(
-          "Net.TCPSocketType",
-          1, ClientSocketHandle::NUM_TYPES, ClientSocketHandle::NUM_TYPES + 1);
-  tcp_socket_type_counter->SetFlags(kUmaTargetedHistogramFlag);
-  tcp_socket_type_counter->Add(handle.reuse_type());
+  UMA_HISTOGRAM_ENUMERATION("Net.TCPSocketType", handle.reuse_type(),
+      ClientSocketHandle::NUM_TYPES);
 
   if (use_late_binding_histogram) {
-    static scoped_refptr<Histogram> tcp_socket_type_counter2 =
-        LinearHistogram::LinearHistogramFactoryGet(
-            FieldTrial::MakeName("Net.TCPSocketType",
-                                 "SocketLateBinding").data(),
-            1, ClientSocketHandle::NUM_TYPES,
-            ClientSocketHandle::NUM_TYPES + 1);
-    tcp_socket_type_counter2->SetFlags(kUmaTargetedHistogramFlag);
-    tcp_socket_type_counter2->Add(handle.reuse_type());
+    UMA_HISTOGRAM_ENUMERATION(
+        FieldTrial::MakeName("Net.TCPSocketType", "SocketLateBinding"),
+        handle.reuse_type(), ClientSocketHandle::NUM_TYPES);
   }
 
   UMA_HISTOGRAM_CLIPPED_TIMES(
       "Net.TransportSocketRequestTime",
       time_to_obtain_connected_socket,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10),
       100);
 
   if (use_late_binding_histogram) {
     UMA_HISTOGRAM_CUSTOM_TIMES(
@@ skipping 37 matching lines @@
       NOTREACHED();
       break;
   }
 }
 
 void HttpNetworkTransaction::LogIOErrorMetrics(
     const ClientSocketHandle& handle) {
   static const bool use_late_binding_histogram =
       !FieldTrial::MakeName("", "SocketLateBinding").empty();
 
-  static scoped_refptr<Histogram> io_error_socket_type_counter =
-      LinearHistogram::LinearHistogramFactoryGet(
-          "Net.IOError_SocketReuseType",
-          1, ClientSocketHandle::NUM_TYPES, ClientSocketHandle::NUM_TYPES + 1);
-  io_error_socket_type_counter->SetFlags(kUmaTargetedHistogramFlag);
-  io_error_socket_type_counter->Add(handle.reuse_type());
+  UMA_HISTOGRAM_ENUMERATION("Net.IOError_SocketReuseType",
+       handle.reuse_type(), ClientSocketHandle::NUM_TYPES);
 
   if (use_late_binding_histogram) {
-    static scoped_refptr<Histogram> io_error_socket_type_counter =
-        LinearHistogram::LinearHistogramFactoryGet(
-            FieldTrial::MakeName("Net.IOError_SocketReuseType",
-                                 "SocketLateBinding").data(),
-            1, ClientSocketHandle::NUM_TYPES,
-            ClientSocketHandle::NUM_TYPES + 1);
-    io_error_socket_type_counter->SetFlags(kUmaTargetedHistogramFlag);
-    io_error_socket_type_counter->Add(handle.reuse_type());
+    UMA_HISTOGRAM_ENUMERATION(
+        FieldTrial::MakeName("Net.IOError_SocketReuseType",
+                             "SocketLateBinding"),
+        handle.reuse_type(), ClientSocketHandle::NUM_TYPES);
   }
 
   switch (handle.reuse_type()) {
     case ClientSocketHandle::UNUSED:
       break;
     case ClientSocketHandle::UNUSED_IDLE:
       UMA_HISTOGRAM_CUSTOM_TIMES(
           "Net.SocketIdleTimeOnIOError2_UnusedSocket",
           handle.idle_time(), base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromMinutes(6), 100);
@@ skipping 578 matching lines @@
   AuthChallengeInfo* auth_info = new AuthChallengeInfo;
   auth_info->is_proxy = target == HttpAuth::AUTH_PROXY;
   auth_info->host_and_port = ASCIIToWide(GetHostAndPort(auth_origin));
   auth_info->scheme = ASCIIToWide(auth_handler_[target]->scheme());
   // TODO(eroman): decode realm according to RFC 2047.
   auth_info->realm = ASCIIToWide(auth_handler_[target]->realm());
   response_.auth_challenge = auth_info;
 }
 
 }  // namespace net