* 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

 // Copyright 2015 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.
 
 #include "services/url_response_disk_cache/url_response_disk_cache_db.h"
 
 #include <string.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
 // character.
 const char kVersionKey[] = "\1version";
 
 // TODO(darin): These Serialize / Deserialize methods should not live here.
 // They use private details of the bindings system. Instead, we should provide
 // these as helper functions under mojo/public/cpp/bindings/.
 
 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);
 
   output->clear();
   output->resize(size);
 
   mojo::internal::FixedBuffer buf;
   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);
 }
 
 template <typename T>
 bool Deserialize(void* data, size_t size, T* output) {
   typedef typename mojo::internal::WrapperTraits<T>::DataType DataType;
   mojo::internal::BoundsChecker bounds_checker(data, size, 0);
   if (!std::remove_pointer<DataType>::type::Validate(data, &bounds_checker)) {
     return false;
   }
   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;
 }
 
 template <typename T>
 bool Deserialize(std::string s, T* output) {
   return Deserialize(&s.at(0), s.size(), output);
 }
 
 template <typename T>
 bool Deserialize(const leveldb::Slice& s, T* output) {
@@ skipping 169 matching lines @@
 }
 
 scoped_ptr<URLResponseDiskCacheDB::Iterator>
 URLResponseDiskCacheDB::GetIterator() {
   return make_scoped_ptr(new Iterator(db_));
 }
 
 URLResponseDiskCacheDB::~URLResponseDiskCacheDB() {}
 
 }  // namespace mojo