Some easy conversions of scoped_ptr -> std::unique_ptr in the EDK.

mojo/edk/system/remote_producer_data_pipe_impl.h

Index: mojo/edk/system/remote_producer_data_pipe_impl.h
diff --git a/mojo/edk/system/remote_producer_data_pipe_impl.h b/mojo/edk/system/remote_producer_data_pipe_impl.h
index 49a1a3439992e4a4bf32bd68e9a49ad143c9cc8c..1b72fc6f2f336dd722263db7841658d2be39f4b2 100644
--- a/mojo/edk/system/remote_producer_data_pipe_impl.h
+++ b/mojo/edk/system/remote_producer_data_pipe_impl.h
@@ -5,9 +5,10 @@
 #ifndef MOJO_EDK_SYSTEM_REMOTE_PRODUCER_DATA_PIPE_IMPL_H_
 #define MOJO_EDK_SYSTEM_REMOTE_PRODUCER_DATA_PIPE_IMPL_H_
 
+#include <memory>
+
 #include "base/memory/aligned_memory.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/data_pipe_impl.h"
 #include "mojo/edk/system/system_impl_export.h"
@@ -25,10 +26,11 @@ class MOJO_SYSTEM_IMPL_EXPORT RemoteProducerDataPipeImpl final
     : public DataPipeImpl {
  public:
   explicit RemoteProducerDataPipeImpl(ChannelEndpoint* channel_endpoint);
-  RemoteProducerDataPipeImpl(ChannelEndpoint* channel_endpoint,
-                             scoped_ptr<char, base::AlignedFreeDeleter> buffer,
-                             size_t start_index,
-                             size_t current_num_bytes);
+  RemoteProducerDataPipeImpl(
+      ChannelEndpoint* channel_endpoint,
+      std::unique_ptr<char, base::AlignedFreeDeleter> buffer,
+      size_t start_index,
+      size_t current_num_bytes);
   ~RemoteProducerDataPipeImpl() override;
 
   // Processes messages that were received and queued by an |IncomingEndpoint|.
@@ -38,7 +40,7 @@ class MOJO_SYSTEM_IMPL_EXPORT RemoteProducerDataPipeImpl final
   static bool ProcessMessagesFromIncomingEndpoint(
       const MojoCreateDataPipeOptions& validated_options,
       MessageInTransitQueue* messages,
-      scoped_ptr<char, base::AlignedFreeDeleter>* buffer,
+      std::unique_ptr<char, base::AlignedFreeDeleter>* buffer,
       size_t* buffer_num_bytes);
 
  private:
@@ -107,7 +109,7 @@ class MOJO_SYSTEM_IMPL_EXPORT RemoteProducerDataPipeImpl final
   // Should be valid if and only if |producer_open()| returns true.
   scoped_refptr<ChannelEndpoint> channel_endpoint_;
 
-  scoped_ptr<char, base::AlignedFreeDeleter> buffer_;
+  std::unique_ptr<char, base::AlignedFreeDeleter> buffer_;
   // Circular buffer.
   size_t start_index_;
   size_t current_num_bytes_;