Remove some LatencyInfo merging code path

content/browser/renderer_host/render_widget_host_view_aura.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 509 matching lines @@
 
   typedef base::Callback<void(bool, const scoped_refptr<ui::Texture>&)>
       BufferPresentedCallback;
 
   // The common entry point for buffer updates from renderer
   // and GPU process.
   void BuffersSwapped(const gfx::Size& surface_size,
                       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,
                           float surface_scale_factor,
                           const gfx::Rect& damage_rect,
                           const std::string& mailbox_name,
                           const BufferPresentedCallback& ack_callback);
 
   void SwapBuffersCompleted(
       const BufferPresentedCallback& ack_callback,
       const scoped_refptr<ui::Texture>& texture_to_return);
 
   void SwapDelegatedFrame(
       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);
 
   // DelegatedFrameEvictorClient implementation.
   virtual void EvictDelegatedFrame() OVERRIDE;
 
   // cc::DelegatedFrameProviderClient implementation.
   virtual void UnusedResourcesAreAvailable() OVERRIDE;
 
   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,
                             unsigned software_frame_id);
 
   void DidReceiveFrameFromRenderer();
 
   BrowserAccessibilityManager* GetOrCreateBrowserAccessibilityManager();
 
   // Helper function to set keyboard focus to the main window.
@@ skipping 218 matching lines @@
   // passed to windowless plugins like Flash/Silverlight, etc as the
   // container window.
   HWND plugin_parent_window_;
 #endif
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_AURA_H_