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

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

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_
 
 #include <type_traits>
 
 #include "mojo/public/cpp/bindings/lib/template_util.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
 class String;
 
 template <typename T>
 class Array;
 
 template <typename Interface>
-class InterfacePtr;
+class InterfaceHandle;
 
 template <typename Interface>
 class InterfaceRequest;
 
 template <typename K, typename V>
 class Map;
 
 namespace internal {
 template <typename T>
 class Array_Data;
@@ skipping 173 matching lines @@
 };
 template <typename H>
 struct WrapperTraits<ScopedHandleBase<H>, true, false> {
   using DataType = H;
 };
 template <typename I>
 struct WrapperTraits<InterfaceRequest<I>, true, false> {
   using DataType = MessagePipeHandle;
 };
 template <typename Interface>
-struct WrapperTraits<InterfacePtr<Interface>, true, false> {
+struct WrapperTraits<InterfaceHandle<Interface>, true, false> {
   using DataType = Interface_Data;
 };
+
 // Unions.
 template <typename U>
 struct WrapperTraits<StructPtr<U>, true, true> {
   using DataType = typename U::Data_;
 };
 template <typename U>
 struct WrapperTraits<InlinedStructPtr<U>, true, true> {
   using DataType = typename U::Data_;
 };
 // Catch-all for other pointer types: arrays, maps.
@@ skipping 18 matching lines @@
 };
 
 template <typename T>
 struct ValueTraits<ScopedHandleBase<T>> {
   static bool Equals(const ScopedHandleBase<T>& a,
                      const ScopedHandleBase<T>& b) {
     return (&a == &b) || (!a.is_valid() && !b.is_valid());
   }
 };
 
-// |InterfacePtr|s hold message pipes uniquely, so they can only be equal if
+// |InterfaceHandle|s hold message pipes uniquely, so they can only be equal if
 // they're the same object or are both "invalid".
 template <typename I>
-struct ValueTraits<InterfacePtr<I>> {
-  static bool Equals(const InterfacePtr<I>& a, const InterfacePtr<I>& b) {
-    return (&a == &b) || (!a.is_bound() && !b.is_bound());
+struct ValueTraits<InterfaceHandle<I>> {
+  static bool Equals(const InterfaceHandle<I>& a, const InterfaceHandle<I>& b) {
+    return (&a == &b) || (!a.is_valid() && !b.is_valid());
   }
 };
 
 // |InterfaceRequest|s hold message pipes uniquely, so they can only be equal if
 // they're the same object or are both "invalid".
 template <typename I>
 struct ValueTraits<InterfaceRequest<I>> {
   static bool Equals(const InterfaceRequest<I>& a,
                      const InterfaceRequest<I>& b) {
     return (&a == &b) || (!a.is_pending() && !b.is_pending());
   }
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_INTERNAL_H_