Remove some LatencyInfo merging code path

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index fdf42e28929714a3761aafc9ec2d8a7f8e3ae8bd..a2727a37cf24a76e2b4a0c1b3522a73696bd2c13 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -527,7 +527,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
                       const gfx::Rect& damage_rect,
                       float surface_scale_factor,
                       const std::string& mailbox_name,
-                      const ui::LatencyInfo& latency_info,
+                      const std::vector<ui::LatencyInfo>& latency_info,
                       const BufferPresentedCallback& ack_callback);
 
   bool SwapBuffersPrepare(const gfx::Rect& surface_rect,
@@ -544,7 +544,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
       uint32 output_surface_id,
       scoped_ptr<cc::DelegatedFrameData> frame_data,
       float frame_device_scale_factor,
-      const ui::LatencyInfo& latency_info);
+      const std::vector<ui::LatencyInfo>& latency_info);
   void SendDelegatedFrameAck(uint32 output_surface_id);
   void SendReturnedDelegatedResources(uint32 output_surface_id);
 
@@ -557,7 +557,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   void SwapSoftwareFrame(uint32 output_surface_id,
                          scoped_ptr<cc::SoftwareFrameData> frame_data,
                          float frame_device_scale_factor,
-                         const ui::LatencyInfo& latency_info);
+                         const std::vector<ui::LatencyInfo>& latency_info);
   void SendSoftwareFrameAck(uint32 output_surface_id);
   void SendReclaimSoftwareFrames();
   void ReleaseSoftwareFrame(uint32 output_surface_id,