* Change C++ serialization/deserialization to not be move-only operations (with the except of |Ha…

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 "mojo/public/cpp/bindings/lib/map_internal.h"
@@ skipping 117 matching lines @@
 
   // 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
   // non-null state.
   void Swap(std::map<Key, Value>* other) {
     is_null_ = false;
     map_.swap(*other);
   }
 
-  // Removes all contents from the Map and places them into parallel key/value
-  // arrays. Each key will be copied from the source to the destination, and
-  // values will be copied unless their type is designated move-only, in which
-  // case they will be passed by calling their Pass() method. Either way, the
-  // Map will be left in a null state.
-  void DecomposeMapTo(mojo::Array<Key>* keys, mojo::Array<Value>* values) {
-    Traits::Decompose(&map_, keys, values);
-    Traits::Finalize(&map_);
-    map_.clear();
-    is_null_ = true;
-  }
-
   // Returns a new Map that contains a copy of the contents of this map.  If the
   // values are of a type that is designated move-only, they will be cloned
   // using the Clone() method of the type. Please note that calling this method
   // will fail compilation if the value type cannot be cloned (which usually
   // means that it is a Mojo handle type or a type that contains Mojo handles).
   Map Clone() const {
     Map result;
     result.is_null_ = is_null_;
     Traits::Clone(map_, &result.map_);
     return result.Pass();
@@ skipping 154 matching lines @@
             TypeConverter<STLValue, MojoValue>::Convert(it.GetValue())));
       }
     }
     return result;
   }
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_MAP_H_