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

mojo/edk/system/data_pipe.h

 // Copyright 2013 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_H_
 #define MOJO_EDK_SYSTEM_DATA_PIPE_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/embedder/platform_handle_vector.h"
 #include "mojo/edk/system/channel_endpoint_client.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/system/mutex.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/types.h"
 #include "mojo/public/cpp/system/macros.h"
@@ skipping 136 matching lines @@
                             size_t* actual_size,
                             embedder::PlatformHandleVector* platform_handles);
   bool ConsumerIsBusy() const;
 
   // The following are only to be used by |DataPipeImpl| (and its subclasses):
 
   // Replaces |impl_| with |new_impl| (which must not be null). For use when
   // serializing data pipe dispatchers (i.e., in |ProducerEndSerialize()| and
   // |ConsumerEndSerialize()|). Returns the old value of |impl_| (in case the
   // caller needs to manage its lifetime).
-  scoped_ptr<DataPipeImpl> ReplaceImplNoLock(scoped_ptr<DataPipeImpl> new_impl)
+  std::unique_ptr<DataPipeImpl> ReplaceImplNoLock(
+      std::unique_ptr<DataPipeImpl> new_impl)
       MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void SetProducerClosedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void SetConsumerClosedNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   void ProducerCloseNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void ConsumerCloseNoLock() MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
 
   // Thread-safe and fast (they don't take |mutex_|):
   const MojoCreateDataPipeOptions& validated_options() const {
     return validated_options_;
@@ skipping 50 matching lines @@
   // particular: |struct_size| is ignored (so |validated_options| must be the
   // current version of the struct) and |capacity_num_bytes| must be nonzero.
   // TODO(vtl): |has_local_producer|/|has_local_consumer| shouldn't really be
   // arguments here. Instead, they should be determined from the |impl| ... but
   // the |impl|'s typically figures these out by examining the owner, i.e., the
   // |DataPipe| object. Probably, this indicates that more stuff should be moved
   // to |DataPipeImpl|, but for now we'll live with this.
   DataPipe(bool has_local_producer,
            bool has_local_consumer,
            const MojoCreateDataPipeOptions& validated_options,
-           scoped_ptr<DataPipeImpl> impl);
+           std::unique_ptr<DataPipeImpl> impl);
   ~DataPipe() override;
 
   // |ChannelEndpointClient| implementation:
   bool OnReadMessage(unsigned port, MessageInTransit* message) override;
   void OnDetachFromChannel(unsigned port) override;
 
   void AwakeProducerAwakablesForStateChangeNoLock(
       const HandleSignalsState& new_producer_state)
       MOJO_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
   void AwakeConsumerAwakablesForStateChangeNoLock(
@@ skipping 18 matching lines @@
   mutable Mutex mutex_;
   // *Known* state of producer or consumer.
   bool producer_open_ MOJO_GUARDED_BY(mutex_);
   bool consumer_open_ MOJO_GUARDED_BY(mutex_);
   // Non-null only if the producer or consumer, respectively, is local.
   std::unique_ptr<AwakableList> producer_awakable_list_ MOJO_GUARDED_BY(mutex_);
   std::unique_ptr<AwakableList> consumer_awakable_list_ MOJO_GUARDED_BY(mutex_);
   // These are nonzero if and only if a two-phase write/read is in progress.
   uint32_t producer_two_phase_max_num_bytes_written_ MOJO_GUARDED_BY(mutex_);
   uint32_t consumer_two_phase_max_num_bytes_read_ MOJO_GUARDED_BY(mutex_);
-  scoped_ptr<DataPipeImpl> impl_ MOJO_GUARDED_BY(mutex_);
+  std::unique_ptr<DataPipeImpl> impl_ MOJO_GUARDED_BY(mutex_);
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(DataPipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_DATA_PIPE_H_