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 |