EDK: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk/system.

mojo/edk/system/channel_endpoint.h

 // Copyright 2014 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_CHANNEL_ENDPOINT_H_
 #define MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
 
+#include <memory>
+
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
@@ skipping 101 matching lines @@
   // |Channel| and immediately detach itself.
   ChannelEndpoint(ChannelEndpointClient* client,
                   unsigned client_port,
                   MessageInTransitQueue* message_queue = nullptr);
 
   // Methods called by |ChannelEndpointClient|:
 
   // Called to enqueue an outbound message. (If |AttachAndRun()| has not yet
   // been called, the message will be enqueued and sent when |AttachAndRun()| is
   // called.)
-  bool EnqueueMessage(scoped_ptr<MessageInTransit> message);
+  bool EnqueueMessage(std::unique_ptr<MessageInTransit> message);
 
   // Called to *replace* current client with a new client (which must differ
   // from the existing client). This must not be called after
   // |DetachFromClient()| has been called.
   //
   // This returns true in the typical case, and false if this endpoint has been
   // detached from the channel, in which case the caller should probably call
   // its (new) client's |OnDetachFromChannel()|.
   bool ReplaceClient(ChannelEndpointClient* client, unsigned client_port);
 
   // Called before the |ChannelEndpointClient| gives up its reference to this
   // object.
   void DetachFromClient();
 
   // Methods called by |Channel|:
 
   // Called when the |Channel| takes a reference to this object. This will send
   // all queue messages (in |channel_message_queue_|).
   // TODO(vtl): Maybe rename this "OnAttach"?
   void AttachAndRun(Channel* channel,
                     ChannelEndpointId local_id,
                     ChannelEndpointId remote_id);
 
   // Called when the |Channel| receives a message for the |ChannelEndpoint|.
-  void OnReadMessage(scoped_ptr<MessageInTransit> message);
+  void OnReadMessage(std::unique_ptr<MessageInTransit> message);
 
   // Called before the |Channel| gives up its reference to this object.
   void DetachFromChannel();
 
  private:
   friend class base::RefCountedThreadSafe<ChannelEndpoint>;
   ~ChannelEndpoint();
 
-  bool WriteMessageNoLock(scoped_ptr<MessageInTransit> message)
+  bool WriteMessageNoLock(std::unique_ptr<MessageInTransit> message)
       MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   // Helper for |OnReadMessage()|, handling messages for the client.
-  void OnReadMessageForClient(scoped_ptr<MessageInTransit> message);
+  void OnReadMessageForClient(std::unique_ptr<MessageInTransit> message);
 
   // Moves |state_| from |RUNNING| to |DEAD|. |channel_| must be non-null, but
   // this does not call |channel_->DetachEndpoint()|.
   void DieNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   Mutex mutex_;
 
   enum class State {
     // |AttachAndRun()| has not been called yet (|channel_| is null).
     PAUSED,
@@ skipping 34 matching lines @@
   // messages to the channel.
   MessageInTransitQueue channel_message_queue_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_