Mojo C++ bindings: share DataView class between chromium and blink variants.

mojo/public/cpp/bindings/map_data_view.h

Index: mojo/public/cpp/bindings/map_data_view.h
diff --git a/mojo/public/cpp/bindings/map_data_view.h b/mojo/public/cpp/bindings/map_data_view.h
index c340407b360cb3ef43897c5e99001113834fff20..a65bb9eca14eaf69f8d29beaf46137d7e51ccf81 100644
--- a/mojo/public/cpp/bindings/map_data_view.h
+++ b/mojo/public/cpp/bindings/map_data_view.h
@@ -6,21 +6,18 @@
 #define MOJO_PUBLIC_CPP_BINDINGS_MAP_DATA_VIEW_H_
 
 #include "base/logging.h"
-#include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/array_data_view.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
+#include "mojo/public/cpp/bindings/lib/map_data_internal.h"
 #include "mojo/public/cpp/bindings/lib/serialization_context.h"
 #include "mojo/public/cpp/bindings/lib/serialization_forward.h"
-#include "mojo/public/cpp/bindings/map.h"
 
 namespace mojo {
 
 template <typename K, typename V>
 class MapDataView {
  public:
-  using Data_ = typename internal::MojomTypeTraits<
-      Map<typename internal::DataViewTraits<K>::MojomType,
-          typename internal::DataViewTraits<V>::MojomType>>::Data;
+  using Data_ = typename internal::MojomTypeTraits<MapDataView<K, V>>::Data;
 
   MapDataView() {}
 
@@ -43,9 +40,8 @@ class MapDataView {
 
   template <typename U>
   bool ReadKeys(U* output) {
-    return internal::Deserialize<
-        Array<typename internal::DataViewTraits<K>::MojomType>>(
-        keys_.data_, output, keys_.context_);
+    return internal::Deserialize<ArrayDataView<K>>(keys_.data_, output,
+                                                   keys_.context_);
   }
 
   ArrayDataView<V>& values() { return values_; }
@@ -53,9 +49,8 @@ class MapDataView {
 
   template <typename U>
   bool ReadValues(U* output) {
-    return internal::Deserialize<
-        Array<typename internal::DataViewTraits<V>::MojomType>>(
-        values_.data_, output, values_.context_);
+    return internal::Deserialize<ArrayDataView<V>>(values_.data_, output,
+                                                   values_.context_);
   }
 
  private: