Refactoring of media::HDRMetadata struct

media/mojo/interfaces/media_types.mojom

Index: media/mojo/interfaces/media_types.mojom
diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom
index bb58218c570002d94d6ffae252be20e97a7aa5ff..16612b5dcf68a8e5a7e423257f0c85cf74f80303 100644
--- a/media/mojo/interfaces/media_types.mojom
+++ b/media/mojo/interfaces/media_types.mojom
@@ -89,22 +89,18 @@ struct VideoColorSpace {
 // This defines a mojo transport format for media::HDRMetadata.
 // See media/base/hdr_metadata.h for description.
 struct MasteringMetadata {
-  float primary_r_chromaticity_x;
-  float primary_r_chromaticity_y;
-  float primary_g_chromaticity_x;
-  float primary_g_chromaticity_y;
-  float primary_b_chromaticity_x;
-  float primary_b_chromaticity_y;
-  float white_point_chromaticity_x;
-  float white_point_chromaticity_y;
+  gfx.mojom.PointF primary_r;
+  gfx.mojom.PointF primary_g;
+  gfx.mojom.PointF primary_b;
+  gfx.mojom.PointF white_point;
   float luminance_max;
   float luminance_min;
 };
 
 struct HDRMetadata {
   MasteringMetadata mastering_metadata;
-  uint32 max_cll;
-  uint32 max_fall;
+  uint32 max_content_light_level;
+  uint32 max_frame_average_light_level;
 };
 
 // This defines a mojo transport format for media::AudioDecoderConfig.