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

mojo/public/cpp/bindings/lib/array_serialization.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_ARRAY_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_
 
 #include <string.h>  // For |memcpy()|.
 #include <type_traits>
 #include <vector>
 
 #include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/bindings/lib/iterator_util.h"
 #include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/map_serialization_forward.h"
 #include "mojo/public/cpp/bindings/lib/string_serialization.h"
-#include "mojo/public/cpp/bindings/lib/template_util.h"
 #include "mojo/public/cpp/bindings/lib/validation_errors.h"
 
 namespace mojo {
 namespace internal {
 
 // The ArraySerializer template contains static methods for serializing |Array|s
 // of various types.  These methods include:
 //   * size_t GetSerializedSize(..)
 //       Computes the size of the serialized version of the |Array|.
 //   * void SerializeElements(..)
 //       Takes an |Iterator| and a size and serializes it.
 //   * void DeserializeElements(..)
 //       Takes a pointer to an |Array_Data| and deserializes it into a given
 //       |Array|.
 //
 // Note: The enable template parameter exists only to allow partial
 // specializations to disable instantiation using logic based on E and F.
 // By default, assuming that there are no other substitution failures, the
 // specialization will instantiate and needs to take no action.  A partial
 // specialization of the form
 //
 // template<E, F> struct ArraySerialzer<E, F>
 //
 // may be limited to values of E and F with particular properties by supplying
 // an expression for enable which will cause substitution failure if the
 // properties of E and F do not satisfy the expression.
 template <typename E,
           typename F,
           bool is_union =
-              IsUnionDataType<typename RemovePointer<F>::type>::value,
+              IsUnionDataType<typename std::remove_pointer<F>::type>::value,
           typename enable = void>
 struct ArraySerializer;
 
 // Handles serialization and deserialization of arrays of pod types.
 template <typename E, typename F>
 struct ArraySerializer<
     E,
     F,
     false,
     typename std::enable_if<std::is_convertible<E, F>::value ||
@@ skipping 125 matching lines @@
     output->Swap(&result);
   }
 };
 
 // This template must only apply to pointer mojo entity (structs, arrays,
 // strings).  This is done by ensuring that WrapperTraits<S>::DataType is a
 // pointer.
 template <typename S>
 struct ArraySerializer<
     S,
-    typename EnableIf<IsPointer<typename WrapperTraits<S>::DataType>::value,
-                      typename WrapperTraits<S>::DataType>::type,
+    typename std::enable_if<
+        std::is_pointer<typename WrapperTraits<S>::DataType>::value,
+        typename WrapperTraits<S>::DataType>::type,
     false> {
   typedef
-      typename RemovePointer<typename WrapperTraits<S>::DataType>::type S_Data;
+      typename std::remove_pointer<typename WrapperTraits<S>::DataType>::type
+          S_Data;
   static size_t GetSerializedSize(const Array<S>& input) {
     size_t size = sizeof(Array_Data<S_Data*>) +
                   input.size() * sizeof(StructPointer<S_Data>);
     for (size_t i = 0; i < input.size(); ++i)
       size += GetSerializedSize_(*(UnwrapConstStructPtr<S>::value(input[i])));
     return size;
   }
 
   template <typename Iterator>
   static ValidationError SerializeElements(
@@ skipping 32 matching lines @@
   }
 
  private:
   // SerializeCaller template is used by |ArraySerializer| to dispatch a
   // serialize call on a non-POD type.  This template is defined outside
   // |ArraySerializer| since you cannot specialize a struct within a class
   // definition.
   struct SerializeCaller {
     // This template needs to be suppressed if |T| is |String|, otherwise it
     // takes precedence over the |String|-overloaded Run() below.
-    template <typename T,
-              typename = typename EnableIf<!IsSame<T, String>::value, T>::type>
+    template <
+        typename T,
+        typename =
+            typename std::enable_if<!std::is_same<T, String>::value, T>::type>
     static ValidationError Run(T* input,
                                Buffer* buf,
                                typename WrapperTraits<T>::DataType* output,
                                const ArrayValidateParams* validate_params) {
       MOJO_DCHECK(!validate_params)
           << "Struct type should not have array validate params";
       return Serialize_(UnwrapStructPtr<T>::value(*input), buf, output);
     }
 
     static ValidationError Run(const String* input,
@@ skipping 159 matching lines @@
   if (input) {
     internal::ArraySerializer<E, F>::DeserializeElements(input, output);
   } else {
     output->reset();
   }
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ARRAY_SERIALIZATION_H_