Use <type_traits> in the C++ bindings library wherever possible.

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

Index: mojo/public/cpp/bindings/lib/template_util.h
diff --git a/mojo/public/cpp/bindings/lib/template_util.h b/mojo/public/cpp/bindings/lib/template_util.h
index 9a5788ce85d6537cf5cba289025cfdd7befad53a..734f67625f1aa1cf5949debc43f1f67065fe0cb9 100644
--- a/mojo/public/cpp/bindings/lib/template_util.h
+++ b/mojo/public/cpp/bindings/lib/template_util.h
@@ -5,38 +5,11 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_TEMPLATE_UTIL_H_
 
+#include <type_traits>
+
 namespace mojo {
 namespace internal {
 
-template <class T, T v>
-struct IntegralConstant {
-  static const T value = v;
-};
-
-template <class T, T v>
-const T IntegralConstant<T, v>::value;
-
-typedef IntegralConstant<bool, true> TrueType;
-typedef IntegralConstant<bool, false> FalseType;
-
-template <class T>
-struct IsConst : FalseType {};
-template <class T>
-struct IsConst<const T> : TrueType {};
-
-template <class T>
-struct IsPointer : FalseType {};
-template <class T>
-struct IsPointer<T*> : TrueType {};
-
-template <bool B, typename T = void>
-struct EnableIf {};
-
-template <typename T>
-struct EnableIf<true, T> {
-  typedef T type;
-};
-
 // Types YesType and NoType are guaranteed such that sizeof(YesType) <
 // sizeof(NoType).
 typedef char YesType;
@@ -57,72 +30,26 @@ struct IsMoveOnlyType {
   static NoType Test(...);
 
   static const bool value =
-      sizeof(Test<T>(0)) == sizeof(YesType) && !IsConst<T>::value;
+      sizeof(Test<T>(0)) == sizeof(YesType) && !std::is_const<T>::value;
 };
 
 // Returns a reference to |t| when T is not a move-only type.
 template <typename T>
-typename EnableIf<!IsMoveOnlyType<T>::value, T>::type& Forward(T& t) {
+typename std::enable_if<!IsMoveOnlyType<T>::value, T>::type& Forward(T& t) {
   return t;
 }
 
 // Returns the result of t.Pass() when T is a move-only type.
 template <typename T>
-typename EnableIf<IsMoveOnlyType<T>::value, T>::type Forward(T& t) {
+typename std::enable_if<IsMoveOnlyType<T>::value, T>::type Forward(T& t) {
   return t.Pass();
 }
 
-// This goop is a trick used to implement a template that can be used to
-// determine if a given class is the base class of another given class.
-template <typename, typename>
-struct IsSame {
-  static bool const value = false;
-};
-template <typename A>
-struct IsSame<A, A> {
-  static bool const value = true;
-};
-template <typename Base, typename Derived>
-struct IsBaseOf {
- private:
-  // This class doesn't work correctly with forward declarations.
-  // Because sizeof cannot be applied to incomplete types, this line prevents us
-  // from passing in forward declarations.
-  typedef char (*EnsureTypesAreComplete)[sizeof(Base) + sizeof(Derived)];
-
-  static Derived* CreateDerived();
-  static char(&Check(Base*))[1];
-  static char(&Check(...))[2];
-
- public:
-  static bool const value = sizeof Check(CreateDerived()) == 1 &&
-                            !IsSame<Base const, void const>::value;
-};
-
-template <class T>
-struct RemovePointer {
-  typedef T type;
-};
-template <class T>
-struct RemovePointer<T*> {
-  typedef T type;
-};
-
 template <template <typename...> class Template, typename T>
-struct IsSpecializationOf : FalseType {};
+struct IsSpecializationOf : std::false_type {};
 
 template <template <typename...> class Template, typename... Args>
-struct IsSpecializationOf<Template, Template<Args...>> : TrueType {};
-
-template <bool B, typename T, typename F>
-struct Conditional {
-  typedef T type;
-};
-
-template <typename T, typename F>
-struct Conditional<false, T, F> {
-  typedef F type;
-};
+struct IsSpecializationOf<Template, Template<Args...>> : std::true_type {};
 
 }  // namespace internal
 }  // namespace mojo