2 files changed, 1 insertions, 16 deletions
diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h
index 633c14c..ebb8348 100644
--- a/content/common/content_param_traits_macros.h
+++ b/content/common/content_param_traits_macros.h
@@ -14,7 +14,6 @@
 #include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebPageVisibilityState.h"
-#include "ui/events/latency_info.h"
 #include "webkit/common/resource_type.h"
 
 #undef IPC_MESSAGE_EXPORT
@@ -28,8 +27,6 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(blink::WebInputEvent::Type,
                               blink::WebInputEvent::TypeLast)
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebPageVisibilityState,
                           blink::WebPageVisibilityStateLast)
-IPC_ENUM_TRAITS_MAX_VALUE(ui::LatencyComponentType,
-                          ui::LATENCY_COMPONENT_TYPE_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline)
   IPC_STRUCT_TRAITS_MEMBER(startOffset)
@@ -38,16 +35,4 @@ IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline)
   IPC_STRUCT_TRAITS_MEMBER(thick)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(ui::LatencyInfo::LatencyComponent)
-  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(ui::LatencyInfo)
-  IPC_STRUCT_TRAITS_MEMBER(latency_components)
-  IPC_STRUCT_TRAITS_MEMBER(trace_id)
-  IPC_STRUCT_TRAITS_MEMBER(terminated)
-IPC_STRUCT_TRAITS_END()
-
 #endif  // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_
diff --git a/content/common/input_messages.h b/content/common/input_messages.h
index 4d97a44..d4fff90 100644
--- a/content/common/input_messages.h
+++ b/content/common/input_messages.h
@@ -23,7 +23,7 @@
 #include "content/common/input/touch_action.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/events/latency_info.h"
+#include "ui/events/ipc/latency_info_param_traits.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/vector2d_f.h"