Revert of Add LatencyInfo support for Surfaces. (patchset #3 id:40001 of...

Revert of Add LatencyInfo support for Surfaces. (patchset #3 id:40001 of https://codereview.chromium.org/511423004/)

Reason for revert:
Failed compile here: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Builder/builds/12959/steps/compile/logs/stdio

Original issue's description:
> Add LatencyInfo support for Surfaces.
>
> BUG=
>
> Committed: https://chromium.googlesource.com/chromium/src/+/30ea8cb30b9e0d6fcd037bc434b29bac41196e5e

TBR=jamesr@chromium.org,jbauman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/533913003

Cr-Commit-Position: refs/heads/master@{#293003}

cc/cc.gyp

@@ -505,7 +505,6 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/events/events.gyp:events_base',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],

cc/surfaces/display.cc

@@ -112,7 +112,8 @@ bool Display::Draw() {
                        device_viewport_rect,
                        device_clip_rect,
                        disable_picture_quad_image_filtering);
-  renderer_->SwapBuffers(frame->metadata);
+  CompositorFrameMetadata metadata;
+  renderer_->SwapBuffers(metadata);
   for (SurfaceAggregator::SurfaceIndexMap::iterator it =
            aggregator_->previous_contained_surfaces().begin();
        it != aggregator_->previous_contained_surfaces().end();

cc/surfaces/surface.cc

@@ -33,7 +33,6 @@ Surface::~Surface() {
 
 void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame,
                          const base::Closure& callback) {
-  TakeLatencyInfo(&frame->metadata.latency_info);
   scoped_ptr<CompositorFrame> previous_frame = current_frame_.Pass();
   current_frame_ = frame.Pass();
   factory_->ReceiveFromChild(
@@ -61,19 +60,6 @@ const CompositorFrame* Surface::GetEligibleFrame() {
   return current_frame_.get();
 }
 
-void Surface::TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info) {
-  if (!current_frame_)
-    return;
-  if (latency_info->empty()) {
-    current_frame_->metadata.latency_info.swap(*latency_info);
-    return;
-  }
-  std::copy(current_frame_->metadata.latency_info.begin(),
-            current_frame_->metadata.latency_info.end(),
-            std::back_inserter(*latency_info));
-  current_frame_->metadata.latency_info.clear();
-}
-
 void Surface::RunDrawCallbacks() {
   if (!draw_callback_.is_null()) {
     base::Closure callback = draw_callback_;

cc/surfaces/surface.h

@@ -13,10 +13,6 @@
 #include "cc/surfaces/surfaces_export.h"
 #include "ui/gfx/size.h"
 
-namespace ui {
-struct LatencyInfo;
-}
-
 namespace cc {
 class CompositorFrame;
 class CopyOutputRequest;
@@ -41,7 +37,6 @@ class CC_SURFACES_EXPORT Surface {
   // Returns a number that increments by 1 every time a new frame is enqueued.
   int frame_index() const { return frame_index_; }
 
-  void TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info);
   void RunDrawCallbacks();
 
   SurfaceFactory* factory() { return factory_; }

cc/surfaces/surface_aggregator.cc

@@ -346,14 +346,6 @@ scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) {
   contained_surfaces_.swap(previous_contained_surfaces_);
   contained_surfaces_.clear();
 
-  for (SurfaceIndexMap::iterator it = previous_contained_surfaces_.begin();
-       it != previous_contained_surfaces_.end();
-       ++it) {
-    Surface* surface = manager_->GetSurfaceForId(it->first);
-    if (surface)
-      surface->TakeLatencyInfo(&frame->metadata.latency_info);
-  }
-
   // TODO(jamesr): Aggregate all resource references into the returned frame's
   // resource list.