Clean up histogram'd media enum max values.

media/filters/stream_parser_factory.cc

Index: media/filters/stream_parser_factory.cc
diff --git a/media/filters/stream_parser_factory.cc b/media/filters/stream_parser_factory.cc
index 6b22f4d0f934a5d56d3e11d755bb282d66df3d80..9bcad5b928a10d75e0ebf25ec8881bba48bf35a2 100644
--- a/media/filters/stream_parser_factory.cc
+++ b/media/filters/stream_parser_factory.cc
@@ -49,7 +49,7 @@ struct CodecInfo {
     HISTOGRAM_EAC3,
     HISTOGRAM_MP3,
     HISTOGRAM_OPUS,
-    HISTOGRAM_MAX  // Must be the last entry.
+    HISTOGRAM_MAX = HISTOGRAM_OPUS  // Must be equal to last entry!

[rileya (GONE FROM CHROMIUM), 2014/01/29 19:24:11]

HISTOGRAM_MAX now seems like kind of a misnomer, as it isn't the max we're using
for the UMA call, but rather the max of the enum itself. Given that everything
else is prefixed with HISTOGRAM_ I suppose this is alright though...

[Ami GONE FROM CHROMIUM, 2014/01/29 21:29:02]

Can this enum type be replaced with a union of audio & video codec enum?

   };
 
   const char* pattern;
@@ -397,12 +397,14 @@ scoped_ptr<StreamParser> StreamParserFactory::Create(
     // Log the number of codecs specified, as well as the details on each one.
     UMA_HISTOGRAM_COUNTS_100("Media.MSE.NumberOfTracks", codecs.size());
     for (size_t i = 0; i < audio_codecs.size(); ++i) {
-      UMA_HISTOGRAM_ENUMERATION(
-          "Media.MSE.AudioCodec", audio_codecs[i], CodecInfo::HISTOGRAM_MAX);
+      UMA_HISTOGRAM_ENUMERATION("Media.MSE.AudioCodec",
+                                audio_codecs[i],
+                                CodecInfo::HISTOGRAM_MAX + 1);
     }
     for (size_t i = 0; i < video_codecs.size(); ++i) {
-      UMA_HISTOGRAM_ENUMERATION(
-          "Media.MSE.VideoCodec", video_codecs[i], CodecInfo::HISTOGRAM_MAX);
+      UMA_HISTOGRAM_ENUMERATION("Media.MSE.VideoCodec",
+                                video_codecs[i],
+                                CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, log_cb));