Convert contenttype data use metrics to use ScaledLinearHistogram

Bug: 782233
Change-Id: I4e0e8d06dd8d2be5613fd221a541fec67a9857c2
Reviewed-on: https://chromium-review.googlesource.com/1111471Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Commit-Queue: rajendrant <rajendrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569697}

components/data_use_measurement/core/data_use_measurement.cc

@@ -4,6 +4,7 @@
 
 #include "components/data_use_measurement/core/data_use_measurement.h"
 
+#include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
@@ -441,22 +442,12 @@ void DataUseMeasurement::RecordContentTypeHistogram(
                        : (!is_tab_visible ? DataUseUserData::VIDEO_TABBACKGROUND
                                           : DataUseUserData::VIDEO);
   }
-  // Use the more primitive STATIC_HISTOGRAM_POINTER_BLOCK macro because the
-  // simple UMA_HISTOGRAM_ENUMERATION macros don't expose 'AddKiB'.
   if (is_user_traffic) {
-    STATIC_HISTOGRAM_POINTER_BLOCK(
-        "DataUse.ContentType.UserTrafficKB", AddKiB(content_type, bytes),
-        base::LinearHistogram::FactoryGet(
-            "DataUse.ContentType.UserTrafficKB", 1, DataUseUserData::TYPE_MAX,
-            DataUseUserData::TYPE_MAX + 1,
-            base::HistogramBase::kUmaTargetedHistogramFlag));
+    UMA_HISTOGRAM_SCALED_ENUMERATION("DataUse.ContentType.UserTrafficKB",
+                                     content_type, bytes, 1024);
   } else {
-    STATIC_HISTOGRAM_POINTER_BLOCK(
-        "DataUse.ContentType.ServicesKB", AddKiB(content_type, bytes),
-        base::LinearHistogram::FactoryGet(
-            "DataUse.ContentType.ServicesKB", 1, DataUseUserData::TYPE_MAX,
-            DataUseUserData::TYPE_MAX + 1,
-            base::HistogramBase::kUmaTargetedHistogramFlag));
+    UMA_HISTOGRAM_SCALED_ENUMERATION("DataUse.ContentType.ServicesKB",
+                                     content_type, bytes, 1024);
   }
 }
 

components/data_use_measurement/core/data_use_user_data.h

@@ -88,7 +88,7 @@ class DataUseUserData : public base::SupportsUserData::Data {
     VIDEO_APPBACKGROUND = 10,
     VIDEO_TABBACKGROUND = 11,
     VIDEO = 12,
-    TYPE_MAX = 13,
+    kMaxValue = 13,
   };
 
   // The state of the application. Only available on Android and on other