media/VaapiVideoDecoder: refactor failures UMA: followup

crrev.com/c/2339787 refactored the UMAs tracking VAAPI errors, but
had a few naming inconsistencies/mistakes. This CL fixes those.

Bug: b:162962069
Change-Id: I820565cb94c61b33be73b0f8301205a0c3308a8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367734
Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800664}

media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc

@@ -457,7 +457,7 @@ VaapiJpegEncodeAccelerator::Initialize(
   scoped_refptr<VaapiWrapper> vpp_vaapi_wrapper = VaapiWrapper::Create(
       VaapiWrapper::kVideoProcess, VAProfileNone,
       base::Bind(&ReportVaapiErrorToUMA,
-                 "Media.VaapiJpegEncodeAccelerator.VppVAAPIError"));
+                 "Media.VaapiJpegEncodeAccelerator.Vpp.VAAPIError"));
   if (!vpp_vaapi_wrapper) {
     VLOGF(1) << "Failed initializing VAAPI wrapper for VPP";
     return PLATFORM_FAILURE;

media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc

@@ -143,7 +143,7 @@ bool VaapiMjpegDecodeAccelerator::Initialize(
   vpp_vaapi_wrapper_ = VaapiWrapper::Create(
       VaapiWrapper::kVideoProcess, VAProfileNone,
       base::Bind(&ReportVaapiErrorToUMA,
-                 "Media.VaapiMjpegDecodeAccelerator.VppVAAPIError"));
+                 "Media.VaapiMjpegDecodeAccelerator.Vpp.VAAPIError"));
   if (!vpp_vaapi_wrapper_) {
     VLOGF(1) << "Failed initializing VAAPI for VPP";
     return false;

media/gpu/vaapi/vaapi_video_decode_accelerator.cc

@@ -707,7 +707,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
       vpp_vaapi_wrapper_ = VaapiWrapper::Create(
           VaapiWrapper::kVideoProcess, VAProfileNone,
           base::Bind(&ReportVaapiErrorToUMA,
-                     "Media.VaapiVideoDecodeAccelerator.VppVAAPIError"));
+                     "Media.VaapiVideoDecodeAccelerator.Vpp.VAAPIError"));
       RETURN_AND_NOTIFY_ON_FAILURE(vpp_vaapi_wrapper_,
                                    "Failed to initialize VppVaapiWrapper",
                                    PLATFORM_FAILURE, );

media/gpu/vaapi/vaapi_video_encode_accelerator.cc

@@ -720,7 +720,7 @@ std::unique_ptr<VaapiEncodeJob> VaapiVideoEncodeAccelerator::CreateEncodeJob(
       vpp_vaapi_wrapper_ = VaapiWrapper::Create(
           VaapiWrapper::kVideoProcess, VAProfileNone,
           base::Bind(&ReportVaapiErrorToUMA,
-                     "Media.VaapiVideoEncodeAccelerator.VppVAAPIError"));
+                     "Media.VaapiVideoEncodeAccelerator.Vpp.VAAPIError"));
       if (!vpp_vaapi_wrapper_) {
         NOTIFY_ERROR(kPlatformFailureError,
                      "Failed to initialize VppVaapiWrapper");

tools/metrics/histograms/enums.xml

@@ -71942,9 +71942,6 @@ Full version information for the fingerprint enum values:
 </enum>
 
 <enum name="VAJEAEncoderResult">
-  <obsolete>
-    Deprecated as of 8/2020, superseded by VaapiFunctions.
-  </obsolete>
   <int value="0" label="VAAPI_SUCCESS"/>
   <int value="1" label="VAAPI_ERROR"/>
 </enum>

tools/metrics/histograms/histograms.xml

@@ -82876,7 +82876,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.VaapiVideoDecoder.DecodeError" enum="BooleanError"
     expires_after="2021-08-05">
   <owner>mcasas@chromium.org</owner>
-  <owner>chromeos-gfx-video@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
   <summary>
     The codec-specific delegate in VaapiVideoDecoder has returned an error from
     Decode(). This could be a parse error, or a VA error itself.
@@ -82886,7 +82886,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.VaapiVideoDecoder.VaapiWrapperCreationSuccess"
     enum="BooleanSuccess" expires_after="2021-08-05">
   <owner>mcasas@chromium.org</owner>
-  <owner>chromeos-gfx-video@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
   <summary>
     Whether the creation of VaapiWrapper succeeded or not inside
     VaapiVideoDecoder.
@@ -82944,7 +82944,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.VAJDA.VppFailure" enum="VAJDAFailure"
     expires_after="2021-01-31">
   <obsolete>
-    Replaced by Media.VaapiMjpegDecodeAccelerator.VppVAAPIError as of 08/2020.
+    Replaced by Media.VaapiMjpegDecodeAccelerator.Vpp.VAAPIError as of 08/2020.
   </obsolete>
   <owner>kamesan@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -82980,7 +82980,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.VAJEA.VppFailure" enum="VAJEAEncoderResult"
     expires_after="M87">
   <obsolete>
-    Replaced by Media.VaapiJpegEncodeAccelerator.VppVAAPIError as of 08/2020.
+    Replaced by Media.VaapiJpegEncodeAccelerator.Vpp.VAAPIError as of 08/2020.
   </obsolete>
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -84195,7 +84195,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Media.{VaapiClientName}.VAAPIError" enum="VaapiFunctions"
     expires_after="2021-08-05">
   <owner>mcasas@chromium.org</owner>
-  <owner>chromeos-gfx-video@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
   <summary>
     Error codes reported by libva (via VaapiWrapper) while being used from the
     specified client name.
@@ -84207,6 +84207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     <variant name="VaapiMjpegDecodeAccelerator" label=""/>
     <variant name="VaapiMjpegDecodeAccelerator.Vpp" label=""/>
     <variant name="VaapiVideoDecodeAccelerator" label=""/>
+    <variant name="VaapiVideoDecodeAccelerator.Vpp" label=""/>
     <variant name="VaapiVideoDecoder" label=""/>
     <variant name="VaapiVideoEncodeAccelerator" label=""/>
     <variant name="VaapiVideoEncodeAccelerator.Vpp" label=""/>