diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
index 4d1efef5..0ba7a154 100644
--- a/media/gpu/vaapi/vaapi_wrapper.cc
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -442,15 +442,15 @@ const ProfileCodecMap& GetProfileCodecMap() {
           // VaapiWrapper does not support VP9 Profile 1, see b/153680337.
           // {VP9PROFILE_PROFILE1, VAProfileVP9Profile1},
           {VP9PROFILE_PROFILE2, VAProfileVP9Profile2},
-      // VaapiWrapper does not support Profile 3.
-      //{VP9PROFILE_PROFILE3, VAProfileVP9Profile3},
+          // VaapiWrapper does not support Profile 3.
+          //{VP9PROFILE_PROFILE3, VAProfileVP9Profile3},
           {AV1PROFILE_PROFILE_MAIN, VAProfileAV1Profile0},
-        // VaapiWrapper does not support AV1 Profile 1.
-        // {AV1PROFILE_PROFILE_HIGH, VAProfileAV1Profile1},
-#if BUILDFLAG(ENABLE_PLATFORM_HEVC_DECODING)
+          // VaapiWrapper does not support AV1 Profile 1.
+          // {AV1PROFILE_PROFILE_HIGH, VAProfileAV1Profile1},
+#if BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
           {HEVCPROFILE_MAIN, VAProfileHEVCMain},
           {HEVCPROFILE_MAIN10, VAProfileHEVCMain10},
-#endif
+#endif  // BUILDFLAG(ENABLE_HEVC_PARSER_AND_HW_DECODER)
   });
   return *kMediaToVAProfileMap;
 }
@@ -2922,9 +2922,6 @@ bool VaapiWrapper::BlitSurface(const VASurface& va_surface_src,
         pipeline_param->rotation_state = VA_ROTATION_270;
         break;
     }
-
-    const VAStatus va_res = mapping.Unmap();
-    VA_SUCCESS_OR_RETURN(va_res, VaapiFunctions::kVAUnmapBuffer, false);
   }
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)