Make GPU.GpuBlockedBetweenSwapsUs2 local

The histagram is expiring and we didn't use it as UMA for quite a
while. This CL makes it LOCAL_HISTOGRAM instead of UMA_HISTOGRAM to
be able to use in telemetry runs.

Bug: 1140046f
Change-Id: Ic15517035ca11fd6626632d38cf202b5e0600d7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2486115Reviewed-by: Weilun Shi <sweilun@chromium.org>
Reviewed-by: Ilya Sherman <isherman@chromium.org>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829220}

base/metrics/histogram_macros_local.h

@@ -69,6 +69,12 @@
       base::Histogram::FactoryTimeGet(name, min, max, bucket_count,        \
                                       base::HistogramBase::kNoFlags))
 
+#define LOCAL_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(name, sample, min, max, \
+                                                  bucket_count)           \
+  STATIC_HISTOGRAM_POINTER_BLOCK(                                         \
+      name, AddTimeMicrosecondsGranularity(sample),                       \
+      base::Histogram::FactoryMicrosecondsTimeGet(                        \
+          name, min, max, bucket_count, base::HistogramBase::kNoFlags))
 //------------------------------------------------------------------------------
 // Memory histograms.
 //

gpu/ipc/service/pass_through_image_transport_surface.cc

@@ -10,6 +10,7 @@
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/histogram_macros_local.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/swap_buffers_complete_params.h"
 #include "ui/gfx/vsync_provider.h"
@@ -255,7 +256,7 @@ void PassThroughImageTransportSurface::FinishSwapBuffers(
       // Report only if collection is enabled and supported on current platform
       // See gpu::Scheduler::TakeTotalBlockingTime for details.
       if (!blocked_time_since_last_swap.is_min()) {
-        UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(
+        LOCAL_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES(
             "GPU.GpuBlockedBetweenSwapsUs2", blocked_time_since_last_swap,
             kTimingMetricsHistogramMin, kTimingMetricsHistogramMax,
             kTimingMetricsHistogramBuckets);

tools/metrics/histograms/histograms_xml/gpu/histograms.xml

@@ -627,6 +627,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="GPU.GpuBlockedBetweenSwapsUs2" units="microseconds"
     expires_after="2020-12-01">
+  <obsolete>
+    Removed in Nov 2020 (available as local histogram for telemetry runs).
+  </obsolete>
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>