Revert 237857 "Revert 237848 "Use LatencyInfoSwapPromise to trac..."

trunk/src/cc/trees/layer_tree_impl.h

Index: trunk/src/cc/trees/layer_tree_impl.h
===================================================================
--- trunk/src/cc/trees/layer_tree_impl.h	(revision 237886)
+++ trunk/src/cc/trees/layer_tree_impl.h	(working copy)
@@ -15,7 +15,6 @@
 #include "cc/base/swap_promise.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/ui_resource_client.h"
-#include "ui/events/latency_info.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
@@ -207,17 +206,13 @@
   void SetRootLayerScrollOffsetDelegate(
       LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate);
 
-  void SetLatencyInfo(const ui::LatencyInfo& latency_info);
-  const ui::LatencyInfo& GetLatencyInfo();
-  void ClearLatencyInfo();
-
   // Call this function when you expect there to be a swap buffer.
   // See swap_promise.h for how to use SwapPromise.
   void QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise);
 
   // Take the |new_swap_promise| and append it to |swap_promise_list_|.
   void PassSwapPromises(ScopedPtrVector<SwapPromise>* new_swap_promise);
-  void FinishSwapPromises();
+  void FinishSwapPromises(CompositorFrameMetadata* metadata);
   void BreakSwapPromises(SwapPromise::DidNotSwapReason reason);
 
   void DidModifyTilePriorities();
@@ -280,8 +275,6 @@
 
   bool next_activation_forces_redraw_;
 
-  ui::LatencyInfo latency_info_;
-
   ScopedPtrVector<SwapPromise> swap_promise_list_;
 
   UIResourceRequestQueue ui_resource_request_queue_;