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

trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc

Index: trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc
===================================================================
--- trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc	(revision 237886)
+++ trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc	(working copy)
@@ -14,6 +14,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/worker_pool.h"
+#include "cc/base/latency_info_swap_promise.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/layer.h"
@@ -779,8 +780,11 @@
   texture_size_in_layer_ = frame->gl_frame_data->size;
   ComputeContentsSize(frame->metadata);
 
-  if (layer_->layer_tree_host())
-    layer_->layer_tree_host()->SetLatencyInfo(frame->metadata.latency_info);
+  if (layer_->layer_tree_host()) {
+    scoped_ptr<cc::SwapPromise> swap_promise(
+        new cc::LatencyInfoSwapPromise(frame->metadata.latency_info));
+    layer_->layer_tree_host()->QueueSwapPromise(swap_promise.Pass());
+  }
 
   BuffersSwapped(frame->gl_frame_data->mailbox, output_surface_id, callback);
 }