Use std::unique_ptr<base::Value> in V8ValueConverter.

content/public/child/v8_value_converter.h

 // Copyright (c) 2012 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 CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_
 #define CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "content/common/content_export.h"
 #include "v8/include/v8.h"
 
 namespace base {
 class Value;
 }
 
 namespace content {
 
 // Converts between v8::Value (JavaScript values in the v8 heap) and Chrome's
 // values (from base/values.h). Lists and dictionaries are converted
 // recursively.
 //
 // The JSON types (null, boolean, string, number, array, and object) as well as
 // binary values are supported. For binary values, we convert to WebKit
 // ArrayBuffers, and support converting from an ArrayBuffer or any of the
 // ArrayBufferView subclasses (Uint8Array, etc.).
 class CONTENT_EXPORT V8ValueConverter {
  public:
   // Extends the default behaviour of V8ValueConverter.
   class CONTENT_EXPORT Strategy {
    public:
-    typedef base::Callback<base::Value*(
-        v8::Local<v8::Value>, v8::Isolate* isolate)> FromV8ValueCallback;
+    typedef base::Callback<std::unique_ptr<base::Value>(v8::Local<v8::Value>,
+                                                        v8::Isolate* isolate)>
+        FromV8ValueCallback;
 
     virtual ~Strategy() {}
 
     // If false is returned, V8ValueConverter proceeds with the default
     // behavior.
     // Use |callback| to convert any child values, as this will retain
     // the ValueConverter's internal checks for depth and cycles.
     virtual bool FromV8Object(v8::Local<v8::Object> value,
-                              base::Value** out,
+                              std::unique_ptr<base::Value>* out,
                               v8::Isolate* isolate,
                               const FromV8ValueCallback& callback) const;
 
     // If false is returned, V8ValueConverter proceeds with the default
     // behavior.
     // Use |callback| to convert any child values, as this will retain
     // the ValueConverter's internal checks for depth and cycles.
     virtual bool FromV8Array(v8::Local<v8::Array> value,
-                             base::Value** out,
+                             std::unique_ptr<base::Value>* out,
                              v8::Isolate* isolate,
                              const FromV8ValueCallback& callback) const;
 
     // If false is returned, V8ValueConverter proceeds with the default
     // behavior. v8::Object is passed as ArrayBuffer and ArrayBufferView
     // classes are siblings.
     virtual bool FromV8ArrayBuffer(v8::Local<v8::Object> value,
-                                   base::Value** out,
+                                   std::unique_ptr<base::Value>* out,
                                    v8::Isolate* isolate) const;
 
     // If false is returned, V8ValueConverter proceeds with the default
     // behavior. This allows to intercept "non-finite" values and do something
     // with them.
     virtual bool FromV8Number(v8::Local<v8::Number> value,
-                              base::Value** out) const;
+                              std::unique_ptr<base::Value>* out) const;
 
     // If false is returned, V8ValueConverter proceeds with the default
     // behavior.
-    virtual bool FromV8Undefined(base::Value** out) const;
+    virtual bool FromV8Undefined(std::unique_ptr<base::Value>* out) const;
   };
 
   static V8ValueConverter* create();
 
   virtual ~V8ValueConverter() {}
 
   // If true, Date objects are converted into DoubleValues with the number of
   // seconds since Unix epoch.
   //
   // Otherwise they are converted into DictionaryValues with whatever additional
@@ skipping 32 matching lines @@
 
   // Converts a v8::Value to base::Value.
   //
   // Unsupported types (unless explicitly configured) are not converted, so
   // this method may return NULL -- the exception is when converting arrays,
   // where unsupported types are converted to Value(TYPE_NULL).
   //
   // Likewise, if an object throws while converting a property it will not be
   // converted, whereas if an array throws while converting an item it will be
   // converted to Value(TYPE_NULL).
-  // TODO(dcheng): This should return a unique_ptr.
-  virtual base::Value* FromV8Value(v8::Local<v8::Value> value,
-                                   v8::Local<v8::Context> context) const = 0;
+  virtual std::unique_ptr<base::Value> FromV8Value(
+      v8::Local<v8::Value> value,
+      v8::Local<v8::Context> context) const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_CHILD_V8_VALUE_CONVERTER_H_