Refactoring of media::HDRMetadata struct

media/mojo/common/media_type_converters_unittest.cc

Index: media/mojo/common/media_type_converters_unittest.cc
diff --git a/media/mojo/common/media_type_converters_unittest.cc b/media/mojo/common/media_type_converters_unittest.cc
index fe264002a690207c202948be05a5f85803764a19..5cdb9d39bf312f2f2c54165ffb5891757c0154c3 100644
--- a/media/mojo/common/media_type_converters_unittest.cc
+++ b/media/mojo/common/media_type_converters_unittest.cc
@@ -365,16 +365,16 @@ TEST(MediaTypeConvertersTest, ConvertVideoDecoderConfig_HDRMetadata) {
                             COLOR_SPACE_UNSPECIFIED, kCodedSize, kVisibleRect,
                             kNaturalSize, EmptyExtraData(), Unencrypted());
   HDRMetadata hdr_metadata;
-  hdr_metadata.max_fall = 123;
-  hdr_metadata.max_cll = 456;
-  hdr_metadata.mastering_metadata.primary_r_chromaticity_x = 0.1f;
-  hdr_metadata.mastering_metadata.primary_r_chromaticity_y = 0.2f;
-  hdr_metadata.mastering_metadata.primary_g_chromaticity_x = 0.3f;
-  hdr_metadata.mastering_metadata.primary_g_chromaticity_y = 0.4f;
-  hdr_metadata.mastering_metadata.primary_b_chromaticity_x = 0.5f;
-  hdr_metadata.mastering_metadata.primary_b_chromaticity_y = 0.6f;
-  hdr_metadata.mastering_metadata.white_point_chromaticity_x = 0.7f;
-  hdr_metadata.mastering_metadata.white_point_chromaticity_y = 0.8f;
+  hdr_metadata.max_frame_average_light_level = 123;
+  hdr_metadata.max_content_light_level = 456;
+  hdr_metadata.mastering_metadata.primary_r_chromaticity.set_x(0.1f);
+  hdr_metadata.mastering_metadata.primary_r_chromaticity.set_y(0.2f);
+  hdr_metadata.mastering_metadata.primary_g_chromaticity.set_x(0.3f);
+  hdr_metadata.mastering_metadata.primary_g_chromaticity.set_y(0.4f);
+  hdr_metadata.mastering_metadata.primary_b_chromaticity.set_x(0.5f);
+  hdr_metadata.mastering_metadata.primary_b_chromaticity.set_y(0.6f);
+  hdr_metadata.mastering_metadata.white_point_chromaticity.set_x(0.7f);
+  hdr_metadata.mastering_metadata.white_point_chromaticity.set_y(0.8f);
   hdr_metadata.mastering_metadata.luminance_max = 1000;
   hdr_metadata.mastering_metadata.luminance_min = 0;
   config.set_hdr_metadata(hdr_metadata);