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

mojo/gles2/control_thunks_impl.cc

Index: mojo/gles2/control_thunks_impl.cc
diff --git a/mojo/gles2/control_thunks_impl.cc b/mojo/gles2/control_thunks_impl.cc
index 0cb679a2c0d448ab2afb4faf3b4b34de3a085819..bf6f320c9b20c44da032d731b49ed1f3a65af37a 100644
--- a/mojo/gles2/control_thunks_impl.cc
+++ b/mojo/gles2/control_thunks_impl.cc
@@ -4,6 +4,8 @@
 
 #include "mojo/gles2/control_thunks_impl.h"
 
+#include <memory>
+
 #include "mojo/gles2/gles2_context.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
@@ -33,7 +35,7 @@ MGLContext ControlThunksImpl::CreateContext(
     const struct MojoAsyncWaiter* async_waiter) {
   mojo::MessagePipeHandle mph(command_buffer_handle);
   mojo::ScopedMessagePipeHandle scoped_handle(mph);
-  scoped_ptr<GLES2Context> client(
+  std::unique_ptr<GLES2Context> client(
       new GLES2Context(async_waiter, scoped_handle.Pass(), lost_callback,
                        lost_callback_closure));
   if (!client->Initialize())