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

mojo/edk/system/slave_connection_manager.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_SLAVE_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
 
+#include <memory>
+
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/embedder/slave_process_delegate.h"
 #include "mojo/edk/system/connection_manager.h"
 #include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/raw_channel.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
@@ skipping 79 matching lines @@
   // from the delegate thread.)
   scoped_refptr<base::TaskRunner> delegate_thread_task_runner_;
   embedder::SlaveProcessDelegate* slave_process_delegate_;
 
   // This is a private I/O thread on which this class does the bulk of its work.
   // It is started in |Init()| and terminated in |Shutdown()|.
   // TODO(vtl): This isn't really necessary.
   base::Thread private_thread_;
 
   // Only accessed on |private_thread_|:
-  scoped_ptr<RawChannel> raw_channel_;
+  std::unique_ptr<RawChannel> raw_channel_;
   enum AwaitingAckType {
     NOT_AWAITING_ACK,
     AWAITING_ACCEPT_CONNECT_ACK,
     AWAITING_CANCEL_CONNECT_ACK,
     AWAITING_CONNECT_ACK
   };
   AwaitingAckType awaiting_ack_type_;
   Result* ack_result_;
   // Used only when waiting for the ack to "connect":
   ProcessIdentifier* ack_peer_process_identifier_;
@@ skipping 29 matching lines @@
   Mutex mutex_;
   base::WaitableEvent event_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(SlaveConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_