Mojo: more idiomatic C++ bindings

mojo/services/gles2/command_buffer_impl.cc

 // Copyright 2013 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 "mojo/services/gles2/command_buffer_impl.h"
 
 #include "base/bind.h"
 #include "base/memory/shared_memory.h"
 
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/context_group.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_control_service.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "gpu/command_buffer/service/image_manager.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_tracking.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/services/gles2/command_buffer_type_conversions.h"
 #include "mojo/services/gles2/mojo_buffer_backing.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface.h"
 
 namespace mojo {
 namespace services {
 
 namespace {
 
@@ skipping 115 matching lines @@
 void CommandBufferImpl::SetGetBuffer(int32_t buffer) {
   command_buffer_->SetGetBuffer(buffer);
 }
 
 void CommandBufferImpl::Flush(int32_t put_offset) {
   command_buffer_->Flush(put_offset);
 }
 
 void CommandBufferImpl::MakeProgress(int32_t last_get_offset) {
   // TODO(piman): handle out-of-order.
-  AllocationScope scope;
-  sync_client_->DidMakeProgress(command_buffer_->GetLastState());
+  sync_client_->DidMakeProgress(
+      CommandBufferState::From(command_buffer_->GetLastState()));
 }
 
 void CommandBufferImpl::RegisterTransferBuffer(
     int32_t id,
     mojo::ScopedSharedBufferHandle transfer_buffer,
     uint32_t size) {
   // Take ownership of the memory and map it into this process.
   // This validates the size.
   scoped_ptr<gpu::BufferBacking> backing(
       gles2::MojoBufferBacking::Create(transfer_buffer.Pass(), size));
@@ skipping 23 matching lines @@
 
 void CommandBufferImpl::OnParseError() {
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   client()->LostContext(state.context_lost_reason);
 }
 
 void CommandBufferImpl::DrawAnimationFrame() { client()->DrawAnimationFrame(); }
 
 }  // namespace services
 }  // namespace mojo