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

mojo/public/cpp/bindings/lib/map_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_MAP_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_
 
+#include <type_traits>
+
 #include "mojo/public/cpp/bindings/lib/array_internal.h"
 #include "mojo/public/cpp/bindings/lib/array_serialization.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_internal.h"
 #include "mojo/public/cpp/bindings/lib/string_serialization.h"
+#include "mojo/public/cpp/bindings/lib/template_util.h"
 #include "mojo/public/cpp/bindings/map.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename MapType,
           typename DataType,
           bool value_is_move_only_type = IsMoveOnlyType<MapType>::value,
-          bool is_union =
-              IsUnionDataType<typename RemovePointer<DataType>::type>::value>
+          bool is_union = IsUnionDataType<
+              typename std::remove_pointer<DataType>::type>::value>
 struct MapSerializer;
 
 template <typename MapType, typename DataType>
 struct MapSerializer<MapType, DataType, false, false> {
   static size_t GetBaseArraySize(size_t count) {
     return Align(count * sizeof(DataType));
   }
   static size_t GetItemSize(const MapType& item) { return 0; }
 };
 
@@ skipping 11 matching lines @@
     return Align(count * sizeof(H));
   }
   static size_t GetItemSize(const ScopedHandleBase<H>& item) { return 0; }
 };
 
 // This template must only apply to pointer mojo entity (structs and arrays).
 // This is done by ensuring that WrapperTraits<S>::DataType is a pointer.
 template <typename S>
 struct MapSerializer<
     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,
     true,
     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 GetBaseArraySize(size_t count) {
     return count * sizeof(StructPointer<S_Data>);
   }
   static size_t GetItemSize(const S& item) {
     return GetSerializedSize_(*UnwrapConstStructPtr<S>::value(item));
   }
 };
 
 template <typename U, typename U_Data>
 struct MapSerializer<U, U_Data, true, true> {
@@ skipping 126 matching lines @@
 
     *output = Map<MapKey, MapValue>(keys.Pass(), values.Pass());
   } else {
     output->reset();
   }
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_