Return a unique_ptr from BinaryValue::CreateWithCopiedBuffer.

content/common/android/gin_java_bridge_value.cc

 // 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.
 
 #include "content/common/android/gin_java_bridge_value.h"
 
-#include "base/memory/ptr_util.h"
-
 namespace content {
 
 namespace {
 
 // The magic value is only used to prevent accidental attempts of reading
 // GinJavaBridgeValue from a random BinaryValue.  GinJavaBridgeValue is not
 // intended for scenarios where with BinaryValues are being used for anything
 // else than holding GinJavaBridgeValues.  If a need for such scenario ever
 // emerges, the best solution would be to extend GinJavaBridgeValue to be able
 // to wrap raw BinaryValues.
 const uint32_t kHeaderMagic = 0xBEEFCAFE;
 
 #pragma pack(push, 4)
 struct Header : public base::Pickle::Header {
   uint32_t magic;
   int32_t type;
 };
 #pragma pack(pop)
 
 }
 
 // static
 std::unique_ptr<base::BinaryValue> GinJavaBridgeValue::CreateUndefinedValue() {
   GinJavaBridgeValue gin_value(TYPE_UNDEFINED);
-  return base::WrapUnique(gin_value.SerializeToBinaryValue());
+  return gin_value.SerializeToBinaryValue();
 }
 
 // static
 std::unique_ptr<base::BinaryValue> GinJavaBridgeValue::CreateNonFiniteValue(
     float in_value) {
   GinJavaBridgeValue gin_value(TYPE_NONFINITE);
   gin_value.pickle_.WriteFloat(in_value);
-  return base::WrapUnique(gin_value.SerializeToBinaryValue());
+  return gin_value.SerializeToBinaryValue();
 }
 
 // static
 std::unique_ptr<base::BinaryValue> GinJavaBridgeValue::CreateNonFiniteValue(
     double in_value) {
   return CreateNonFiniteValue(static_cast<float>(in_value));
 }
 
 // static
 std::unique_ptr<base::BinaryValue> GinJavaBridgeValue::CreateObjectIDValue(
     int32_t in_value) {
   GinJavaBridgeValue gin_value(TYPE_OBJECT_ID);
   gin_value.pickle_.WriteInt(in_value);
-  return base::WrapUnique(gin_value.SerializeToBinaryValue());
+  return gin_value.SerializeToBinaryValue();
 }
 
 // static
 bool GinJavaBridgeValue::ContainsGinJavaBridgeValue(const base::Value* value) {
   if (!value->IsType(base::Value::TYPE_BINARY))
     return false;
   const base::BinaryValue* binary_value =
       reinterpret_cast<const base::BinaryValue*>(value);
   if (binary_value->GetSize() < sizeof(Header))
     return false;
@@ skipping 49 matching lines @@
   Header* header = pickle_.headerT<Header>();
   header->magic = kHeaderMagic;
   header->type = type;
 }
 
 GinJavaBridgeValue::GinJavaBridgeValue(const base::BinaryValue* value)
     : pickle_(value->GetBuffer(), value->GetSize()) {
   DCHECK(ContainsGinJavaBridgeValue(value));
 }
 
-base::BinaryValue* GinJavaBridgeValue::SerializeToBinaryValue() {
+std::unique_ptr<base::BinaryValue>
+GinJavaBridgeValue::SerializeToBinaryValue() {
   return base::BinaryValue::CreateWithCopiedBuffer(
       reinterpret_cast<const char*>(pickle_.data()), pickle_.size());
 }
 
 }  // namespace content