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

mojo/edk/system/data_pipe_impl_unittest.cc

 // 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.
 
 // This file contains tests that are shared between different implementations of
 // |DataPipeImpl|.
 
 #include "mojo/edk/system/data_pipe_impl.h"
 
 #include <stdint.h>
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/system/message_pipe.h"
@@ skipping 147 matching lines @@
   }
   void ConsumerRemoveAwakable(Awakable* awakable,
                               HandleSignalsState* signals_state) {
     return dpc()->ConsumerRemoveAwakable(awakable, signals_state);
   }
 
  private:
   DataPipe* dpp() { return helper_->DataPipeForProducer(); }
   DataPipe* dpc() { return helper_->DataPipeForConsumer(); }
 
-  scoped_ptr<Helper> helper_;
+  std::unique_ptr<Helper> helper_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(DataPipeImplTest);
 };
 
 // LocalDataPipeImplTestHelper -------------------------------------------------
 
 class LocalDataPipeImplTestHelper : public DataPipeImplTestHelper {
  public:
   LocalDataPipeImplTestHelper() {}
   ~LocalDataPipeImplTestHelper() override {}
@@ skipping 2258 matching lines @@
   test::Sleep(10u);
 
   EXPECT_EQ(MOJO_RESULT_OK, this->ConsumerEndReadData(num_bytes));
 
   this->ConsumerClose();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo