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

mojo/edk/system/memory.h

Index: mojo/edk/system/memory.h
diff --git a/mojo/edk/system/memory.h b/mojo/edk/system/memory.h
index 31d67cc94d84d32d1e44928c225f2801b9ee2fbb..41d3730276af2abbe2c84bec5a527d6558564fa1 100644
--- a/mojo/edk/system/memory.h
+++ b/mojo/edk/system/memory.h
@@ -9,7 +9,8 @@
 #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"
@@ -305,7 +306,7 @@ class UserPointerReader {
     memcpy(buffer_.get(), user_pointer, count * sizeof(Type));
   }
 
-  scoped_ptr<TypeNoConst[]> buffer_;
+  std::unique_ptr<TypeNoConst[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerReader);
 };
@@ -334,7 +335,7 @@ class UserPointerWriter {
  private:
   UserPointer<Type> user_pointer_;
   size_t count_;
-  scoped_ptr<Type[]> buffer_;
+  std::unique_ptr<Type[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerWriter);
 };
@@ -366,7 +367,7 @@ class UserPointerReaderWriter {
  private:
   UserPointer<Type> user_pointer_;
   size_t count_;
-  scoped_ptr<Type[]> buffer_;
+  std::unique_ptr<Type[]> buffer_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(UserPointerReaderWriter);
 };