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

services/url_response_disk_cache/url_response_disk_cache_db.cc

Index: services/url_response_disk_cache/url_response_disk_cache_db.cc
diff --git a/services/url_response_disk_cache/url_response_disk_cache_db.cc b/services/url_response_disk_cache/url_response_disk_cache_db.cc
index 4e65c01804b896ce0b8b44967c57a5fe3fbeb689..0b49eaeee0f458c983d09cc178876c68339743c8 100644
--- a/services/url_response_disk_cache/url_response_disk_cache_db.cc
+++ b/services/url_response_disk_cache/url_response_disk_cache_db.cc
@@ -28,7 +28,7 @@ const char kVersionKey[] = "\1version";
 template <typename T>
 void Serialize(T input, std::string* output) {
   typedef typename mojo::internal::WrapperTraits<T>::DataType DataType;
-  size_t size = GetSerializedSize_(input);
+  size_t size = GetSerializedSize_(*input.get());

[viettrungluu, 2015/09/23 23:20:24]

Is .get() needed?

[vardhan, 2015/09/25 19:33:05]

Done.

 
   output->clear();
   output->resize(size);
@@ -37,7 +37,7 @@ void Serialize(T input, std::string* output) {
   buf.Initialize(&output->at(0), size);
 
   DataType data_type;
-  Serialize_(input.Pass(), &buf, &data_type);
+  Serialize_(input.get(), &buf, &data_type);
   std::vector<Handle> handles;
   data_type->EncodePointersAndHandles(&handles);
 }
@@ -52,7 +52,8 @@ bool Deserialize(void* data, size_t size, T* output) {
   DataType data_type = reinterpret_cast<DataType>(data);
   std::vector<Handle> handles;
   data_type->DecodePointersAndHandles(&handles);
-  Deserialize_(data_type, output);
+  *output = mojo::internal::RemoveStructPtr<T>::type::New();
+  Deserialize_(data_type, output->get());
   return true;
 }