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

mojo/public/cpp/bindings/map.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_MAP_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_MAP_H_
 
 #include <map>
+#include <type_traits>
 
 #include "mojo/public/cpp/bindings/lib/map_internal.h"
 #include "mojo/public/cpp/bindings/lib/template_util.h"
 
 namespace mojo {
 
 // A move-only map that can handle move-only values. Map has the following
 // characteristics:
 //   - The map itself can be null, and this is distinct from empty.
 //   - Keys must not be move-only.
@@ skipping 152 matching lines @@
   }
 
  private:
   // A Map Iterator, templated for mutable and const iterator behaviour.
   // If |IsConstIterator| is true, the iterator behaves like a const-iterator.
   //
   // TODO(vardhan):  Make this adhere to the BidirectionalIterator concept.
   enum class IteratorMutability { kConst, kMutable };
   template <IteratorMutability MutabilityType = IteratorMutability::kMutable>
   class InternalIterator {
-    using InternalIteratorType = typename internal::Conditional<
+    using InternalIteratorType = typename std::conditional<
         MutabilityType == IteratorMutability::kConst,
         typename std::map<KeyStorageType, ValueStorageType>::const_iterator,
         typename std::map<KeyStorageType, ValueStorageType>::iterator>::type;
 
     using ReturnValueType =
-        typename internal::Conditional<MutabilityType ==
-                                           IteratorMutability::kConst,
-                                       ValueConstRefType,
-                                       ValueRefType>::type;
+        typename std::conditional<MutabilityType == IteratorMutability::kConst,
+                                  ValueConstRefType,
+                                  ValueRefType>::type;
 
    public:
     InternalIterator() : it_() {}
     InternalIterator(InternalIteratorType it) : it_(it) {}
 
     // The key is always a const reference, but the value is conditional on
     // whether this is a const iterator or not.
     KeyConstRefType GetKey() { return Traits::GetKey(it_); }
     ReturnValueType GetValue() { return Traits::GetValue(it_); }
 
@@ skipping 101 matching lines @@
             TypeConverter<STLValue, MojoValue>::Convert(it.GetValue())));
       }
     }
     return result;
   }
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_MAP_H_