Mojo C++ bindings: Rename InterfaceInfoPtr -> InterfaceHandle

mojo/public/cpp/bindings/lib/interface_ptr_internal.h

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_
 
 #include <algorithm>  // For |std::swap()|.
 #include <memory>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/callback.h"
-#include "mojo/public/cpp/bindings/interface_ptr_info.h"
+#include "mojo/public/cpp/bindings/interface_handle.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/bindings/lib/router.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 struct MojoAsyncWaiter;
 
 namespace mojo {
 namespace internal {
 
@@ skipping 49 matching lines @@
 
   void Swap(InterfacePtrState* other) {
     using std::swap;
     swap(other->proxy_, proxy_);
     swap(other->router_, router_);
     handle_.swap(other->handle_);
     swap(other->waiter_, waiter_);
     swap(other->version_, version_);
   }
 
-  void Bind(InterfacePtrInfo<Interface> info, const MojoAsyncWaiter* waiter) {
+  void Bind(InterfaceHandle<Interface> info, const MojoAsyncWaiter* waiter) {
     MOJO_DCHECK(!proxy_);
     MOJO_DCHECK(!router_);
     MOJO_DCHECK(!handle_.is_valid());
     MOJO_DCHECK(!waiter_);
     MOJO_DCHECK(version_ == 0u);
     MOJO_DCHECK(info.is_valid());
 
     handle_ = info.PassHandle();
     waiter_ = waiter;
     version_ = info.version();
   }
 
   bool WaitForIncomingResponse(
       MojoDeadline deadline = MOJO_DEADLINE_INDEFINITE) {
     ConfigureProxyIfNecessary();
 
     MOJO_DCHECK(router_);
     return router_->WaitForIncomingMessage(deadline);
   }
 
   // After this method is called, the object is in an invalid state and
   // shouldn't be reused.
-  InterfacePtrInfo<Interface> PassInterface() {
-    return InterfacePtrInfo<Interface>(
+  InterfaceHandle<Interface> PassInterface() {
+    return InterfaceHandle<Interface>(
         router_ ? router_->PassMessagePipe() : handle_.Pass(), version_);
   }
 
   bool is_bound() const { return handle_.is_valid() || router_; }
 
   bool encountered_error() const {
     return router_ ? router_->encountered_error() : false;
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
@@ skipping 46 matching lines @@
 
   uint32_t version_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(InterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_PTR_INTERNAL_H_