Make echo message per-command-buffer

content/common/gpu/client/command_buffer_proxy.cc

 // 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.
 
 #include "content/common/gpu/client/command_buffer_proxy.h"
 
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/process_util.h"
@@ skipping 325 matching lines @@
     gpu::error::ContextLostReason reason) {
   // Not implemented in proxy.
   NOTREACHED();
 }
 
 bool CommandBufferProxy::Echo(const base::Closure& callback) {
   if (last_state_.error != gpu::error::kNoError) {
     return false;
   }
 
-  if (!Send(new GpuChannelMsg_Echo(GpuCommandBufferMsg_EchoAck(route_id_)))) {
+  if (!Send(new GpuCommandBufferMsg_Echo(route_id_,
+                    GpuCommandBufferMsg_EchoAck(route_id_)))) {
     return false;
   }
 
   echo_tasks_.push(callback);
 
   return true;
 }
 
 bool CommandBufferProxy::SetSurfaceVisible(bool visible) {
   if (last_state_.error != gpu::error::kNoError)
@@ skipping 90 matching lines @@
 
 void CommandBufferProxy::SetOnConsoleMessageCallback(
     const GpuConsoleMessageCallback& callback) {
   console_message_callback_ = callback;
 }
 
 void CommandBufferProxy::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state_->Read(&last_state_);
 }