Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

media/audio/audio_output_resampler.cc

 // Copyright (c) 2012 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 "media/audio/audio_output_resampler.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 75 matching lines @@
   const int output_buffer_size_;
 
   // For audio debug recordings.
   std::unique_ptr<AudioDebugRecorder> debug_recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(OnMoreDataConverter);
 };
 
 // Record UMA statistics for hardware output configuration.
 static void RecordStats(const AudioParameters& output_params) {
-  // Note the 'PRESUBMIT_IGNORE_UMA_MAX's below, these silence the PRESUBMIT.py
-  // check for uma enum max usage, since we're abusing UMA_HISTOGRAM_ENUMERATION
-  // to report a discrete value.
-  UMA_HISTOGRAM_ENUMERATION(
-      "Media.HardwareAudioBitsPerChannel",
-      output_params.bits_per_sample(),
-      limits::kMaxBitsPerSample);  // PRESUBMIT_IGNORE_UMA_MAX
+  UMA_HISTOGRAM_EXACT_LINEAR("Media.HardwareAudioBitsPerChannel",
+                             output_params.bits_per_sample(),
+                             static_cast<int>(limits::kMaxBitsPerSample));
   UMA_HISTOGRAM_ENUMERATION(
       "Media.HardwareAudioChannelLayout", output_params.channel_layout(),
       CHANNEL_LAYOUT_MAX + 1);
-  UMA_HISTOGRAM_ENUMERATION(
-      "Media.HardwareAudioChannelCount", output_params.channels(),
-      limits::kMaxChannels);  // PRESUBMIT_IGNORE_UMA_MAX
+  UMA_HISTOGRAM_EXACT_LINEAR("Media.HardwareAudioChannelCount",
+                             output_params.channels(),
+                             static_cast<int>(limits::kMaxChannels));
 
   AudioSampleRate asr;
   if (ToAudioSampleRate(output_params.sample_rate(), &asr)) {
     UMA_HISTOGRAM_ENUMERATION(
         "Media.HardwareAudioSamplesPerSecond", asr, kAudioSampleRateMax + 1);
   } else {
     UMA_HISTOGRAM_COUNTS(
         "Media.HardwareAudioSamplesPerSecondUnexpected",
         output_params.sample_rate());
   }
 }
 
 // Record UMA statistics for hardware output configuration after fallback.
 static void RecordFallbackStats(const AudioParameters& output_params) {
   UMA_HISTOGRAM_BOOLEAN("Media.FallbackToHighLatencyAudioPath", true);
-  // Note the 'PRESUBMIT_IGNORE_UMA_MAX's below, these silence the PRESUBMIT.py
-  // check for uma enum max usage, since we're abusing UMA_HISTOGRAM_ENUMERATION
-  // to report a discrete value.
-  UMA_HISTOGRAM_ENUMERATION(
-      "Media.FallbackHardwareAudioBitsPerChannel",
-      output_params.bits_per_sample(),
-      limits::kMaxBitsPerSample);  // PRESUBMIT_IGNORE_UMA_MAX
+  UMA_HISTOGRAM_EXACT_LINEAR("Media.FallbackHardwareAudioBitsPerChannel",
+                             output_params.bits_per_sample(),
+                             static_cast<int>(limits::kMaxBitsPerSample));
   UMA_HISTOGRAM_ENUMERATION(
       "Media.FallbackHardwareAudioChannelLayout",
       output_params.channel_layout(), CHANNEL_LAYOUT_MAX + 1);
-  UMA_HISTOGRAM_ENUMERATION(
-      "Media.FallbackHardwareAudioChannelCount", output_params.channels(),
-      limits::kMaxChannels);  // PRESUBMIT_IGNORE_UMA_MAX
+  UMA_HISTOGRAM_EXACT_LINEAR("Media.FallbackHardwareAudioChannelCount",
+                             output_params.channels(),
+                             static_cast<int>(limits::kMaxChannels));
 
   AudioSampleRate asr;
   if (ToAudioSampleRate(output_params.sample_rate(), &asr)) {
     UMA_HISTOGRAM_ENUMERATION(
         "Media.FallbackHardwareAudioSamplesPerSecond",
         asr, kAudioSampleRateMax + 1);
   } else {
     UMA_HISTOGRAM_COUNTS(
         "Media.FallbackHardwareAudioSamplesPerSecondUnexpected",
         output_params.sample_rate());
@@ skipping 348 matching lines @@
     dest->ZeroFramesPartial(frames, dest->frames() - frames);
   return frames > 0 ? 1 : 0;
 }
 
 void OnMoreDataConverter::OnError() {
   error_occurred_ = true;
   source_callback_->OnError();
 }
 
 }  // namespace media