Some scoped_ptr -> std::unique_ptr conversion, especially under //mojo.

mojo/android/system/core_impl.cc

Index: mojo/android/system/core_impl.cc
diff --git a/mojo/android/system/core_impl.cc b/mojo/android/system/core_impl.cc
index 637b7b3cae86a63e65c2f78c544987a8ef54bb8c..14a4c50285678b661999e5339f170d24ff07ad1b 100644
--- a/mojo/android/system/core_impl.cc
+++ b/mojo/android/system/core_impl.cc
@@ -4,13 +4,14 @@
 
 #include "mojo/android/system/core_impl.h"
 
+#include <memory>
+
 #include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "jni/CoreImpl_jni.h"
 #include "mojo/public/c/environment/async_waiter.h"
@@ -40,7 +41,7 @@ struct AsyncWaitCallbackData {
 };
 
 void AsyncWaitCallback(void* data, MojoResult result) {
-  scoped_ptr<AsyncWaitCallbackData> callback_data(
+  std::unique_ptr<AsyncWaitCallbackData> callback_data(
       static_cast<AsyncWaitCallbackData*>(data));
   mojo::android::Java_CoreImpl_onAsyncWaitResult(
       base::android::AttachCurrentThread(),
@@ -400,7 +401,7 @@ static void CancelAsyncWait(JNIEnv* env,
     // the data_ptr.
     return;
   }
-  scoped_ptr<AsyncWaitCallbackData> deleter(
+  std::unique_ptr<AsyncWaitCallbackData> deleter(
       reinterpret_cast<AsyncWaitCallbackData*>(data_ptr));
   Environment::GetDefaultAsyncWaiter()->CancelWait(id);
 }