Merge GpuCommandBufferMsg_SetLatencyInfo into GpuCommandBufferMsg_AsyncFlush

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 146 matching lines @@
                     IPC::Message* reply_message);
   void OnSetGetBuffer(int32 shm_id, IPC::Message* reply_message);
   void OnProduceFrontBuffer(const gpu::Mailbox& mailbox);
   void OnGetState(IPC::Message* reply_message);
   void OnWaitForTokenInRange(int32 start,
                              int32 end,
                              IPC::Message* reply_message);
   void OnWaitForGetOffsetInRange(int32 start,
                                  int32 end,
                                  IPC::Message* reply_message);
-  void OnAsyncFlush(int32 put_offset, uint32 flush_count);
+  void OnAsyncFlush(int32 put_offset, uint32 flush_count,
+                    const std::vector<ui::LatencyInfo>& latency_info);
   void OnEcho(const IPC::Message& message);
   void OnRescheduled();
   void OnRegisterTransferBuffer(int32 id,
                                 base::SharedMemoryHandle transfer_buffer,
                                 uint32 size);
   void OnDestroyTransferBuffer(int32 id);
   void OnGetTransferBuffer(int32 id, IPC::Message* reply_message);
 
   void OnCreateVideoDecoder(media::VideoCodecProfile profile,
                             int32 route_id,
@@ skipping 20 matching lines @@
 
   void OnRegisterGpuMemoryBuffer(int32 id,
                                  gfx::GpuMemoryBufferHandle handle,
                                  uint32 width,
                                  uint32 height,
                                  uint32 internalformat);
   void OnUnregisterGpuMemoryBuffer(int32 id);
 
   void OnCommandProcessed();
   void OnParseError();
-  void OnSetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
   void OnCreateStreamTexture(
       uint32 texture_id, int32 stream_id, bool* succeeded);
 
   void ReportState();
 
   // Wrapper for GpuScheduler::PutChanged that sets the crash report URL.
   void PutChanged();
 
   // Poll the command buffer to execute work.
   void PollWork();
@@ skipping 58 matching lines @@
   size_t total_gpu_memory_;
   scoped_ptr<WaitForCommandState> wait_for_token_;
   scoped_ptr<WaitForCommandState> wait_for_get_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_