EDK: Some more scoped_ptr -> std::unique_ptr conversions.

mojo/edk/system/channel.h

Index: mojo/edk/system/channel.h
diff --git a/mojo/edk/system/channel.h b/mojo/edk/system/channel.h
index 6a612ceed6a8d0d182f194044d92db0471823871..5e55a933e7c079f3a6b7f9c1ab50081c50f69af0 100644
--- a/mojo/edk/system/channel.h
+++ b/mojo/edk/system/channel.h
@@ -7,6 +7,8 @@
 
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -59,7 +61,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel final
   // This must be called on the creation thread before any other methods are
   // called, and before references to this object are given to any other
   // threads. |raw_channel| should be uninitialized.
-  void Init(scoped_ptr<RawChannel> raw_channel) MOJO_NOT_THREAD_SAFE;
+  void Init(std::unique_ptr<RawChannel> raw_channel) MOJO_NOT_THREAD_SAFE;
 
   // Sets the channel manager associated with this channel. This should be set
   // at most once and only called before |WillShutdownSoon()| (and
@@ -247,7 +249,7 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel final
   // https://github.com/domokit/mojo/issues/313
   mutable Mutex mutex_;
 
-  scoped_ptr<RawChannel> raw_channel_ MOJO_GUARDED_BY(mutex_);
+  std::unique_ptr<RawChannel> raw_channel_ MOJO_GUARDED_BY(mutex_);
   bool is_running_ MOJO_GUARDED_BY(mutex_);
   // Set when |WillShutdownSoon()| is called.
   bool is_shutting_down_ MOJO_GUARDED_BY(mutex_);