Remove gpu side LatencyInfo merging

content/common/gpu/gpu_command_buffer_stub.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_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
  public:
   class DestructionObserver {
    public:
     // Called in Destroy(), before the context/surface are released.
     virtual void OnWillDestroyStub() = 0;
 
    protected:
     virtual ~DestructionObserver() {}
   };
 
-  typedef base::Callback<void(const ui::LatencyInfo&)>
+  typedef base::Callback<void(const std::vector<ui::LatencyInfo>&)>
       LatencyInfoCallback;
 
   GpuCommandBufferStub(
       GpuChannel* channel,
       GpuCommandBufferStub* share_group,
       const gfx::GLSurfaceHandle& handle,
       gpu::gles2::MailboxManager* mailbox_manager,
       gpu::gles2::ImageManager* image_manager,
       const gfx::Size& size,
       const gpu::gles2::DisallowedFeatures& disallowed_features,
@@ skipping 114 matching lines @@
 
   void OnRegisterGpuMemoryBuffer(int32 id,
                                  gfx::GpuMemoryBufferHandle gpu_memory_buffer,
                                  uint32 width,
                                  uint32 height,
                                  uint32 internalformat);
   void OnDestroyGpuMemoryBuffer(int32 id);
 
   void OnCommandProcessed();
   void OnParseError();
-  void OnSetLatencyInfo(const ui::LatencyInfo& latency_info);
+  void OnSetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
 
   void ReportState();
 
   // Wrapper for GpuScheduler::PutChanged that sets the crash report URL.
   void PutChanged();
 
   // Poll the command buffer to execute work.
   void PollWork();
 
   // Whether this command buffer needs to be polled again in the future.
@@ skipping 54 matching lines @@
   size_t active_url_hash_;
 
   size_t total_gpu_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_