EDK: More scoped_ptr -> std::unique_ptr conversions.

mojo/edk/system/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_DATA_PIPE_IMPL_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_
 
 #include <stdint.h>
 
+#include <utility>
+
 #include "mojo/edk/embedder/platform_handle_vector.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/edk/system/thread_annotations.h"
 #include "mojo/public/c/system/data_pipe.h"
 #include "mojo/public/c/system/macros.h"
 #include "mojo/public/c/system/types.h"
 
@@ skipping 93 matching lines @@
 
   // Helper to convert the given circular buffer into messages. The input is a
   // circular buffer |buffer| (with appropriate element size and capacity), with
   // current contents starting at |start_index| of length |current_num_bytes|.
   // This will convert all of the contents.
   void ConvertDataToMessages(const char* buffer,
                              size_t* start_index,
                              size_t* current_num_bytes,
                              MessageInTransitQueue* message_queue);
 
-  scoped_ptr<DataPipeImpl> ReplaceImpl(scoped_ptr<DataPipeImpl> new_impl)
-      MOJO_NO_THREAD_SAFETY_ANALYSIS {
-    return owner_->ReplaceImplNoLock(new_impl.Pass());
+  std::unique_ptr<DataPipeImpl> ReplaceImpl(
+      std::unique_ptr<DataPipeImpl> new_impl) MOJO_NO_THREAD_SAFETY_ANALYSIS {
+    return owner_->ReplaceImplNoLock(std::move(new_impl));
   }
   void SetProducerClosed() MOJO_NO_THREAD_SAFETY_ANALYSIS {
     owner_->SetProducerClosedNoLock();
   }
   void SetConsumerClosed() MOJO_NO_THREAD_SAFETY_ANALYSIS {
     owner_->SetConsumerClosedNoLock();
   }
 
   ChannelEndpointClient* channel_endpoint_client() const { return owner_; }
 
@@ skipping 57 matching lines @@
 struct MOJO_ALIGNAS(8) SerializedDataPipeConsumerDispatcher {
   // Only validated (and thus canonicalized) options should be serialized.
   // However, the deserializer must revalidate (as with everything received).
   MojoCreateDataPipeOptions validated_options;
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_IMPL_H_