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

mojo/edk/system/local_data_pipe_impl.cc

 // 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.
 
 // TODO(vtl): I currently potentially overflow in doing index calculations.
 // E.g., |start_index_| and |current_num_bytes_| fit into a |uint32_t|, but
 // their sum may not. This is bad and poses a security risk. (We're currently
 // saved by the limit on capacity -- the maximum size of the buffer, checked in
 // |DataPipe::ValidateOptions()|, is currently sufficiently small.)
 
 #include "mojo/edk/system/local_data_pipe_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/remote_consumer_data_pipe_impl.h"
 #include "mojo/edk/system/remote_producer_data_pipe_impl.h"
+#include "mojo/edk/util/make_unique.h"
 
 namespace mojo {
 namespace system {
 
 // Assert some things about some things defined in data_pipe_impl.h (don't make
 // the assertions there, to avoid including message_in_transit.h).
 static_assert(MOJO_ALIGNOF(SerializedDataPipeConsumerDispatcher) ==
                   MessageInTransit::kMessageAlignment,
               "Wrong alignment");
 static_assert(sizeof(SerializedDataPipeConsumerDispatcher) %
@@ skipping 149 matching lines @@
   // Case 2: The consumer isn't closed. We'll replace ourselves with a
   // |RemoteProducerDataPipeImpl|.
 
   s->consumer_num_bytes = current_num_bytes_;
   // Note: We don't use |port|.
   scoped_refptr<ChannelEndpoint> channel_endpoint =
       channel->SerializeEndpointWithLocalPeer(destination_for_endpoint, nullptr,
                                               channel_endpoint_client(), 0);
   // Note: Keep |*this| alive until the end of this method, to make things
   // slightly easier on ourselves.
-  scoped_ptr<DataPipeImpl> self(ReplaceImpl(make_scoped_ptr(
-      new RemoteProducerDataPipeImpl(channel_endpoint.get(), std::move(buffer_),
-                                     start_index_, current_num_bytes_))));
+  std::unique_ptr<DataPipeImpl> self(
+      ReplaceImpl(util::MakeUnique<RemoteProducerDataPipeImpl>(
+          channel_endpoint.get(), std::move(buffer_), start_index_,
+          current_num_bytes_)));
 
   *actual_size = sizeof(SerializedDataPipeProducerDispatcher) +
                  channel->GetSerializedEndpointSize();
   return true;
 }
 
 void LocalDataPipeImpl::ConsumerClose() {
   // If the producer is around and in a two-phase write, we have to keep the
   // buffer around. (We then don't free it until the producer is closed. This
   // could be rectified, but again seems like optimizing for the uncommon case.)
@@ skipping 164 matching lines @@
   // Case 2: The producer isn't closed. We'll replace ourselves with a
   // |RemoteConsumerDataPipeImpl|.
 
   // Note: We don't use |port|.
   scoped_refptr<ChannelEndpoint> channel_endpoint =
       channel->SerializeEndpointWithLocalPeer(destination_for_endpoint,
                                               &message_queue,
                                               channel_endpoint_client(), 0);
   // Note: Keep |*this| alive until the end of this method, to make things
   // slightly easier on ourselves.
-  scoped_ptr<DataPipeImpl> self(ReplaceImpl(make_scoped_ptr(
-      new RemoteConsumerDataPipeImpl(channel_endpoint.get(), old_num_bytes))));
+  std::unique_ptr<DataPipeImpl> self(
+      ReplaceImpl(util::MakeUnique<RemoteConsumerDataPipeImpl>(
+          channel_endpoint.get(), old_num_bytes)));
 
   *actual_size = sizeof(SerializedDataPipeConsumerDispatcher) +
                  channel->GetSerializedEndpointSize();
   return true;
 }
 
 bool LocalDataPipeImpl::OnReadMessage(unsigned /*port*/,
                                       MessageInTransit* /*message*/) {
   NOTREACHED();
   return false;
@@ skipping 42 matching lines @@
 
 void LocalDataPipeImpl::MarkDataAsConsumed(size_t num_bytes) {
   DCHECK_LE(num_bytes, current_num_bytes_);
   start_index_ += num_bytes;
   start_index_ %= capacity_num_bytes();
   current_num_bytes_ -= num_bytes;
 }
 
 }  // namespace system
 }  // namespace mojo