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

mojo/edk/system/channel_test_base.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_CHANNEL_TEST_BASE_H_
 #define MOJO_EDK_SYSTEM_CHANNEL_TEST_BASE_H_
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/test/test_io_thread.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace system {
 
 class RawChannel;
@@ skipping 25 matching lines @@
 
   mojo::test::TestIOThread* io_thread() { return &io_thread_; }
   Channel* channel(unsigned i) { return channels_[i].get(); }
   scoped_refptr<Channel>* mutable_channel(unsigned i) { return &channels_[i]; }
 
  private:
   void SetUpOnIOThread();
 
   embedder::SimplePlatformSupport platform_support_;
   mojo::test::TestIOThread io_thread_;
-  scoped_ptr<RawChannel> raw_channels_[2];
+  std::unique_ptr<RawChannel> raw_channels_[2];
   scoped_refptr<Channel> channels_[2];
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelTestBase);
 };
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CHANNEL_TEST_BASE_H_