Mojo C++ bindings: add a new mode to generator to use native STL/WTF types

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 <stddef.h>
 #include <map>
+#include <unordered_map>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/template_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
@@ skipping 108 matching lines @@
   void SetToEmpty() {
     is_null_ = false;
     map_.clear();
   }
 
   // Returns a const reference to the std::map managed by this class. If this
   // object is null, the return value will be an empty map.
   const std::map<Key, Value>& storage() const { return map_; }
 
   // Passes the underlying storage and resets this map to null.
-  //
-  // TODO(yzshen): Consider changing this to a rvalue-ref-qualified conversion
-  // to std::map<Key, Value> after we move to MSVC 2015.
   std::map<Key, Value> PassStorage() {
     is_null_ = true;
     return std::move(map_);
   }
 
+  operator const std::map<Key, Value>&() const { return map_; }
+
   // Swaps the contents of this Map with another Map of the same type (including
   // nullness).
   void Swap(Map<Key, Value>* other) {
     std::swap(is_null_, other->is_null_);
     map_.swap(other->map_);
   }
 
   // Swaps the contents of this Map with an std::map containing keys and values
   // of the same type. Since std::map cannot represent the null state, the
   // std::map will be empty if Map is null. The Map will always be left in a
@@ skipping 139 matching lines @@
             TypeConverter<STLValue, MojoValue>::Convert(it->second)));
       }
     }
     return result;
   }
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_MAP_H_