Mojo C++ bindings: make mojo::Map<K,V> more friendly with std::map<K,V>.

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 <stddef.h>
 #include <utility>
 
@@ skipping 102 matching lines @@
       sizeof(internal::ArrayHeader) +
       internal::MapSerializer<MapKey, DataKey>::GetBaseArraySize(count);
   size_t value_base_size =
       sizeof(internal::ArrayHeader) +
       internal::MapSerializer<MapValue, DataValue>::GetBaseArraySize(count);
 
   size_t key_data_size = 0;
   size_t value_data_size = 0;
   for (auto it = input.begin(); it != input.end(); ++it) {
     key_data_size +=
-        internal::MapSerializer<MapKey, DataKey>::GetItemSize(it.GetKey());
+        internal::MapSerializer<MapKey, DataKey>::GetItemSize(it->first);
     value_data_size +=
-        internal::MapSerializer<MapValue, DataValue>::GetItemSize(
-            it.GetValue());
+        internal::MapSerializer<MapValue, DataValue>::GetItemSize(it->second);
   }
 
   return struct_overhead + key_base_size + key_data_size + value_base_size +
          value_data_size;
 }
 
 // We don't need an ArrayValidateParams instance for key validation since
 // we can deduce it from the Key type. (which can only be primitive types or
 // non-nullable strings.)
 template <typename MapKey,
@@ skipping 48 matching lines @@
     *output = Map<MapKey, MapValue>(std::move(keys), std::move(values));
   } else {
     output->reset();
   }
   return success;
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MAP_SERIALIZATION_H_