Index: content/renderer/pepper/v8_var_converter.h |
diff --git a/content/renderer/pepper/v8_var_converter.h b/content/renderer/pepper/v8_var_converter.h |
index 998939b0ccf820a6819d7c7b1c963101ce6de412..835a8e4820945052bd205fdb76a18110809b046d 100644 |
--- a/content/renderer/pepper/v8_var_converter.h |
+++ b/content/renderer/pepper/v8_var_converter.h |
@@ -5,10 +5,11 @@ |
#ifndef CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_ |
#define CONTENT_RENDERER_PEPPER_V8_VAR_CONVERTER_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "content/common/content_export.h" |
#include "ppapi/c/pp_instance.h" |
#include "ppapi/c/pp_var.h" |
@@ -31,7 +32,7 @@ class CONTENT_EXPORT V8VarConverter { |
// Constructor for testing. |
V8VarConverter(PP_Instance instance, |
- scoped_ptr<ResourceConverter> resource_converter); |
+ std::unique_ptr<ResourceConverter> resource_converter); |
~V8VarConverter(); |
// Converts the given PP_Var to a v8::Value. True is returned upon success. |
@@ -84,7 +85,7 @@ class CONTENT_EXPORT V8VarConverter { |
AllowObjectVars object_vars_allowed_; |
// The converter to use for converting V8 vars to resources. |
- scoped_ptr<ResourceConverter> resource_converter_; |
+ std::unique_ptr<ResourceConverter> resource_converter_; |
DISALLOW_COPY_AND_ASSIGN(V8VarConverter); |
}; |