Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

mojo/gles2/command_buffer_client_impl.cc

 // Copyright 2014 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/gles2/command_buffer_client_impl.h"
 
 #include <limits>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "services/gles2/command_buffer_type_conversions.h"
 #include "services/gles2/mojo_buffer_backing.h"
 
 namespace gles2 {
 
 namespace {
 
@@ skipping 22 matching lines @@
 
 }  // namespace
 
 CommandBufferDelegate::~CommandBufferDelegate() {}
 
 void CommandBufferDelegate::ContextLost() {}
 
 class CommandBufferClientImpl::SyncClientImpl
     : public mojo::CommandBufferSyncClient {
  public:
-  SyncClientImpl(mojo::CommandBufferSyncClientPtr* ptr,
+  SyncClientImpl(mojo::InterfaceHandle<mojo::CommandBufferSyncClient>* ptr,
                  const MojoAsyncWaiter* async_waiter)
       : initialized_successfully_(false), binding_(this, ptr, async_waiter) {}
 
   bool WaitForInitialization() {
     if (!binding_.WaitForIncomingMethodCall())
       return false;
     return initialized_successfully_;
   }
 
   mojo::CommandBufferStatePtr WaitForProgress() {
@@ skipping 21 matching lines @@
   mojo::GpuCapabilitiesPtr capabilities_;
   mojo::CommandBufferStatePtr command_buffer_state_;
   mojo::Binding<mojo::CommandBufferSyncClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncClientImpl);
 };
 
 class CommandBufferClientImpl::SyncPointClientImpl
     : public mojo::CommandBufferSyncPointClient {
  public:
-  SyncPointClientImpl(mojo::CommandBufferSyncPointClientPtr* ptr,
-                      const MojoAsyncWaiter* async_waiter)
+  SyncPointClientImpl(
+      mojo::InterfaceHandle<mojo::CommandBufferSyncPointClient>* ptr,
+      const MojoAsyncWaiter* async_waiter)
       : sync_point_(0u), binding_(this, ptr, async_waiter) {}
 
   uint32_t WaitForInsertSyncPoint() {
     if (!binding_.WaitForIncomingMethodCall())
       return 0u;
     uint32_t result = sync_point_;
     sync_point_ = 0u;
     return result;
   }
 
@@ skipping 32 matching lines @@
   mojo::ScopedSharedBufferHandle duped;
   bool result = CreateMapAndDupSharedBuffer(
       kSharedStateSize, &memory, &shared_state_handle_, &duped);
   if (!result)
     return false;
 
   shared_state_ = static_cast<gpu::CommandBufferSharedState*>(memory);
 
   shared_state()->Initialize();
 
-  mojo::CommandBufferSyncClientPtr sync_client;
+  mojo::InterfaceHandle<mojo::CommandBufferSyncClient> sync_client;
   sync_client_impl_.reset(new SyncClientImpl(&sync_client, async_waiter_));
 
-  mojo::CommandBufferSyncPointClientPtr sync_point_client;
+  mojo::InterfaceHandle<mojo::CommandBufferSyncPointClient> sync_point_client;
   sync_point_client_impl_.reset(
       new SyncPointClientImpl(&sync_point_client, async_waiter_));
 
-  mojo::CommandBufferLostContextObserverPtr observer_ptr;
+  mojo::InterfaceHandle<mojo::CommandBufferLostContextObserver> observer_ptr;
   observer_binding_.Bind(GetProxy(&observer_ptr), async_waiter_);
-  command_buffer_->Initialize(sync_client.Pass(),
-                              sync_point_client.Pass(),
-                              observer_ptr.Pass(),
-                              duped.Pass());
+  command_buffer_->Initialize(std::move(sync_client),
+                              std::move(sync_point_client),
+                              std::move(observer_ptr), duped.Pass());
 
   // Wait for DidInitialize to come on the sync client pipe.
   if (!sync_client_impl_->WaitForInitialization()) {
     VLOG(1) << "Channel encountered error while creating command buffer";
     return false;
   }
   capabilities_ = sync_client_impl_->GetCapabilities();
   return true;
 }
 
@@ skipping 157 matching lines @@
   }
 
   if (state->generation - last_state_.generation < 0x80000000U)
     last_state_ = state.To<State>();
 }
 
 void CommandBufferClientImpl::SetLock(base::Lock* lock) {
 }
 
 }  // namespace gles2