Some easy conversions of scoped_ptr -> std::unique_ptr in the EDK.

mojo/edk/system/memory.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_MEMORY_H_
 #define MOJO_EDK_SYSTEM_MEMORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>  // For |memcpy()|.
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 namespace internal {
 
 // Removes |const| from |T| (available as |remove_const<T>::type|):
@@ skipping 275 matching lines @@
       return;
 
     if (check) {
       internal::CheckUserPointerWithCount<sizeof(Type), MOJO_ALIGNOF(Type)>(
           user_pointer, count);
     }
     buffer_.reset(new TypeNoConst[count]);
     memcpy(buffer_.get(), user_pointer, count * sizeof(Type));
   }
 
-  scoped_ptr<TypeNoConst[]> buffer_;
+  std::unique_ptr<TypeNoConst[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerReader);
 };
 
 // Implementation of |UserPointer<Type>::Writer|.
 template <typename Type>
 class UserPointerWriter {
  public:
   // Note: If |count| is zero, |GetPointer()| will always return null.
   UserPointerWriter(UserPointer<Type> user_pointer, size_t count)
       : user_pointer_(user_pointer), count_(count) {
     if (count_ > 0) {
       buffer_.reset(new Type[count_]);
       memset(buffer_.get(), 0, count_ * sizeof(Type));
     }
   }
 
   Type* GetPointer() const { return buffer_.get(); }
 
   void Commit() {
     internal::CheckUserPointerWithCount<sizeof(Type), MOJO_ALIGNOF(Type)>(
         user_pointer_.pointer_, count_);
     memcpy(user_pointer_.pointer_, buffer_.get(), count_ * sizeof(Type));
   }
 
  private:
   UserPointer<Type> user_pointer_;
   size_t count_;
-  scoped_ptr<Type[]> buffer_;
+  std::unique_ptr<Type[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerWriter);
 };
 
 // Implementation of |UserPointer<Type>::ReaderWriter|.
 template <typename Type>
 class UserPointerReaderWriter {
  public:
   // Note: If |count| is zero, |GetPointer()| will always return null.
   UserPointerReaderWriter(UserPointer<Type> user_pointer, size_t count)
@@ skipping 11 matching lines @@
 
   void Commit() {
     internal::CheckUserPointerWithCount<sizeof(Type), MOJO_ALIGNOF(Type)>(
         user_pointer_.pointer_, count_);
     memcpy(user_pointer_.pointer_, buffer_.get(), count_ * sizeof(Type));
   }
 
  private:
   UserPointer<Type> user_pointer_;
   size_t count_;
-  scoped_ptr<Type[]> buffer_;
+  std::unique_ptr<Type[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerReaderWriter);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MEMORY_H_