Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: ppapi/proxy/raw_var_data.h

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/proxy_channel.h ('k') | ppapi/proxy/raw_var_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/raw_var_data.h
diff --git a/ppapi/proxy/raw_var_data.h b/ppapi/proxy/raw_var_data.h
index fec92e79f535a8f0a14c94a54a441e22005cac89..530023fd652a7896856b1e332c0b0282504e1a51 100644
--- a/ppapi/proxy/raw_var_data.h
+++ b/ppapi/proxy/raw_var_data.h
@@ -8,11 +8,11 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
#include <vector>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ppapi/c/pp_instance.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/proxy/ppapi_param_traits.h"
@@ -56,8 +56,8 @@ class PPAPI_PROXY_EXPORT RawVarDataGraph {
public:
// Construct a RawVarDataGraph from a given root PP_Var. A null pointer
// is returned upon failure.
- static scoped_ptr<RawVarDataGraph> Create(const PP_Var& var,
- PP_Instance instance);
+ static std::unique_ptr<RawVarDataGraph> Create(const PP_Var& var,
+ PP_Instance instance);
// Constructs an empty RawVarDataGraph.
RawVarDataGraph();
@@ -73,8 +73,8 @@ class PPAPI_PROXY_EXPORT RawVarDataGraph {
void Write(base::Pickle* m, const HandleWriter& handle_writer);
// Create a RawVarDataGraph from the given message.
- static scoped_ptr<RawVarDataGraph> Read(const base::Pickle* m,
- base::PickleIterator* iter);
+ static std::unique_ptr<RawVarDataGraph> Read(const base::Pickle* m,
+ base::PickleIterator* iter);
// Returns a vector of SerializedHandles associated with this RawVarDataGraph.
// Ownership of the pointers remains with the elements of the RawVarDataGraph.
@@ -88,7 +88,7 @@ class PPAPI_PROXY_EXPORT RawVarDataGraph {
private:
// A list of the nodes in the graph.
- std::vector<scoped_ptr<RawVarData>> data_;
+ std::vector<std::unique_ptr<RawVarData>> data_;
DISALLOW_COPY_AND_ASSIGN(RawVarDataGraph);
};
@@ -295,7 +295,7 @@ class ResourceRawVarData : public RawVarData {
// resource. The message type will vary based on the resource type, and will
// usually contain a pending resource host ID, and other required information.
// If the resource was created directly, this is NULL.
- scoped_ptr<IPC::Message> creation_message_;
+ std::unique_ptr<IPC::Message> creation_message_;
};
} // namespace proxy
« no previous file with comments | « ppapi/proxy/proxy_channel.h ('k') | ppapi/proxy/raw_var_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698