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

mojo/edk/system/remote_producer_data_pipe_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class MessageInTransitQueue;
 
 // |RemoteProducerDataPipeImpl| is a subclass that "implements" |DataPipe| for
 // data pipes whose producer is remote and whose consumer is local. See
 // |DataPipeImpl| for more details.
 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|.
   // On success, returns true and sets |*buffer| (to a buffer of size
   // |validated_options.capacity_num_bytes|) and |*buffer_num_bytes|. On
   // failure, returns false. Always clears |*messages|.
   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:
   // |DataPipeImpl| implementation:
   // Note: None of the |Producer...()| methods should be called, except
   // |ProducerGetHandleSignalsState()|.
   void ProducerClose() override;
   MojoResult ProducerWriteData(UserPointer<const void> elements,
                                UserPointer<uint32_t> num_bytes,
                                uint32_t max_num_bytes_to_write,
@@ skipping 48 matching lines @@
   // Marks the given number of bytes as consumed/discarded. This will send a
   // message to the remote producer. |num_bytes| must be no greater than
   // |current_num_bytes_|.
   void MarkDataAsConsumed(size_t num_bytes);
 
   void Disconnect();
 
   // 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_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(RemoteProducerDataPipeImpl);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_REMOTE_PRODUCER_DATA_PIPE_IMPL_H_