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

Unified Diff: mojo/edk/embedder/platform_handle_vector.h

Issue 1351293002: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk (minus js). (Closed) Base URL: https://github.com/domokit/mojo.git@edk_unique_ptr_5
Patch Set: oops, forgot to fix android Created 5 years, 3 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 | « mojo/edk/embedder/platform_channel_utils_posix.h ('k') | mojo/edk/embedder/test_embedder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/embedder/platform_handle_vector.h
diff --git a/mojo/edk/embedder/platform_handle_vector.h b/mojo/edk/embedder/platform_handle_vector.h
index 771df4fb9d470aa7dcff2f33530bc219dace6d7e..f61eb66452db2e5c4f14cfd99d6419d5f67c85ac 100644
--- a/mojo/edk/embedder/platform_handle_vector.h
+++ b/mojo/edk/embedder/platform_handle_vector.h
@@ -5,9 +5,9 @@
#ifndef MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
#define MOJO_EDK_EMBEDDER_PLATFORM_HANDLE_VECTOR_H_
+#include <memory>
#include <vector>
-#include "base/memory/scoped_ptr.h"
#include "mojo/edk/embedder/platform_handle.h"
#include "mojo/edk/embedder/platform_handle_utils.h"
#include "mojo/edk/system/system_impl_export.h"
@@ -15,9 +15,10 @@
namespace mojo {
namespace embedder {
+// TODO(vtl): Can we switch to using std::vector<ScopedPlatformHandle> instead?
using PlatformHandleVector = std::vector<PlatformHandle>;
-// A deleter (for use with |scoped_ptr|) which closes all handles and then
+// A deleter (for use with |std::unique_ptr|) that closes all handles and then
// |delete|s the |PlatformHandleVector|.
struct MOJO_SYSTEM_IMPL_EXPORT PlatformHandleVectorDeleter {
void operator()(PlatformHandleVector* platform_handles) const {
@@ -27,7 +28,7 @@ struct MOJO_SYSTEM_IMPL_EXPORT PlatformHandleVectorDeleter {
};
using ScopedPlatformHandleVectorPtr =
- scoped_ptr<PlatformHandleVector, PlatformHandleVectorDeleter>;
+ std::unique_ptr<PlatformHandleVector, PlatformHandleVectorDeleter>;
} // namespace embedder
} // namespace mojo
« no previous file with comments | « mojo/edk/embedder/platform_channel_utils_posix.h ('k') | mojo/edk/embedder/test_embedder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698