Switch LatencyInfo struct to use a map.

content/common/cc_messages.h

Index: content/common/cc_messages.h
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
index 4b11d9b2c71aa4db80a74bc83a6f5092667acde9..0d36abf74c0c41a499f090afad306790db8404c7 100644
--- a/content/common/cc_messages.h
+++ b/content/common/cc_messages.h
@@ -107,6 +107,7 @@ struct CONTENT_EXPORT ParamTraits<cc::DelegatedFrameData> {
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 IPC_ENUM_TRAITS(cc::DrawQuad::Material)
+IPC_ENUM_TRAITS(cc::LatencyComponent)
 IPC_ENUM_TRAITS(cc::IOSurfaceDrawQuad::Orientation)
 IPC_ENUM_TRAITS(WebKit::WebFilterOperation::FilterType)
 
@@ -211,11 +212,14 @@ IPC_STRUCT_TRAITS_BEGIN(cc::TransferableResource)
   IPC_STRUCT_TRAITS_MEMBER(mailbox)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(cc::LatencyInfo::ComponentInfo)
+  IPC_STRUCT_TRAITS_MEMBER(sequence_number)
+  IPC_STRUCT_TRAITS_MEMBER(event_time)
+  IPC_STRUCT_TRAITS_MEMBER(event_count)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(cc::LatencyInfo)
-  IPC_STRUCT_TRAITS_MEMBER(renderer_main_frame_number)
-  IPC_STRUCT_TRAITS_MEMBER(renderer_impl_frame_number)
-  IPC_STRUCT_TRAITS_MEMBER(browser_main_frame_number)
-  IPC_STRUCT_TRAITS_MEMBER(browser_impl_frame_number)
+  IPC_STRUCT_TRAITS_MEMBER(latency_numbers)
   IPC_STRUCT_TRAITS_MEMBER(swap_timestamp)
 IPC_STRUCT_TRAITS_END()