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

mojo/edk/system/data_pipe_impl.h

Index: mojo/edk/system/data_pipe_impl.h
diff --git a/mojo/edk/system/data_pipe_impl.h b/mojo/edk/system/data_pipe_impl.h
index 80f808fb46a3174345a224e822b5eeb9e1d421c2..cde495d62156f541ba647abe99e3fb515b0f2a94 100644
--- a/mojo/edk/system/data_pipe_impl.h
+++ b/mojo/edk/system/data_pipe_impl.h
@@ -7,6 +7,8 @@
 
 #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"
@@ -120,9 +122,9 @@ class MOJO_SYSTEM_IMPL_EXPORT DataPipeImpl {
                              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();