Revert https://codereview.chromium.org/1871233002

ui/events/latency_info.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_LATENCY_INFO_LATENCY_INFO_H_
-#define UI_LATENCY_INFO_LATENCY_INFO_H_
+#ifndef UI_EVENTS_LATENCY_INFO_H_
+#define UI_EVENTS_LATENCY_INFO_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/containers/small_map.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
-#include "ui/latency_info/latency_info_export.h"
+#include "ui/events/events_base_export.h"
 
 #if !defined(OS_IOS)
 #include "ipc/ipc_param_traits.h"  // nogncheck
 #endif
 
 namespace ui {
 
 // When adding new components, or new metrics based on LatencyInfo,
 // please update latency_info.dot.
 enum LatencyComponentType {
@@ skipping 61 matching lines @@
   // This component indicates that the input causes a commit to be scheduled
   // but the commit failed.
   INPUT_EVENT_LATENCY_TERMINATED_COMMIT_FAILED_COMPONENT,
   // This component indicates that the input causes a commit to be scheduled
   // but the commit was aborted since it carried no new information.
   INPUT_EVENT_LATENCY_TERMINATED_COMMIT_NO_UPDATE_COMPONENT,
   // This component indicates that the input causes a swap to be scheduled
   // but the swap failed.
   INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT,
   LATENCY_COMPONENT_TYPE_LAST =
-      INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT,
+    INPUT_EVENT_LATENCY_TERMINATED_SWAP_FAILED_COMPONENT,
 };
 
-class LATENCY_INFO_EXPORT LatencyInfo {
+class EVENTS_BASE_EXPORT LatencyInfo {
  public:
   struct LatencyComponent {
     // Nondecreasing number that can be used to determine what events happened
     // in the component at the time this struct was sent on to the next
     // component.
     int64_t sequence_number;
     // Average time of events that happened in this component.
     base::TimeTicks event_time;
     // Count of events that happened in this component
     uint32_t event_count;
   };
 
-  struct LATENCY_INFO_EXPORT InputCoordinate {
+  struct EVENTS_BASE_EXPORT InputCoordinate {
     InputCoordinate();
     InputCoordinate(float x, float y);
 
     float x;
     float y;
   };
 
   // Empirically determined constant based on a typical scroll sequence.
   enum { kTypicalMaxComponentsPerLatencyInfo = 10 };
 
   enum { kMaxInputCoordinates = 2 };
 
   // Map a Latency Component (with a component-specific int64_t id) to a
   // component info.
   typedef base::SmallMap<
       std::map<std::pair<LatencyComponentType, int64_t>, LatencyComponent>,
-      kTypicalMaxComponentsPerLatencyInfo>
-      LatencyMap;
+      kTypicalMaxComponentsPerLatencyInfo> LatencyMap;
 
   LatencyInfo();
   LatencyInfo(const LatencyInfo& other);
   ~LatencyInfo();
 
   // For test only.
   LatencyInfo(int64_t trace_id, bool terminated);
 
   // Returns true if the vector |latency_info| is valid. Returns false
   // if it is not valid and log the |referring_msg|.
@@ skipping 89 matching lines @@
   // Whether a terminal component has been added.
   bool terminated_;
 
 #if !defined(OS_IOS)
   friend struct IPC::ParamTraits<ui::LatencyInfo>;
 #endif
 };
 
 }  // namespace ui
 
-#endif  // UI_LATENCY_INFO_LATENCY_INFO_H_
+#endif  // UI_EVENTS_LATENCY_INFO_H_