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

services/dart/content_handler_app.cc

Index: services/dart/content_handler_app.cc
diff --git a/services/dart/content_handler_app.cc b/services/dart/content_handler_app.cc
index 1babd388546398b8b9d595194e40c2dfe273bade..9bc10e2660ac2a6de8081f6ef56a61f513c5e2b0 100644
--- a/services/dart/content_handler_app.cc
+++ b/services/dart/content_handler_app.cc
@@ -206,7 +206,7 @@ bool DartContentHandlerApp::OnAcceptConnection(
   return true;
 }
 
-scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
+std::unique_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
 DartContentHandler::CreateApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
@@ -244,13 +244,15 @@ DartContentHandler::CreateApplication(
                 base::MessageLoop::current()->task_runner(), FROM_HERE,
                 base::MessageLoop::QuitWhenIdleClosure())));
     base::RunLoop().Run();
-    return make_scoped_ptr(
+    return std::unique_ptr<
+        mojo::ContentHandlerFactory::HandledApplicationHolder>(
         new DartApp(application_request.Pass(), url, application_dir, strict_,
                     run_on_message_loop, override_pause_isolates_flags,
                     pause_isolates_on_start, pause_isolates_on_exit));
   } else {
     // Loading a raw .dart file pointed at by |url|.
-    return make_scoped_ptr(
+    return std::unique_ptr<
+        mojo::ContentHandlerFactory::HandledApplicationHolder>(
         new DartApp(application_request.Pass(), url, strict_,
                     run_on_message_loop, override_pause_isolates_flags,
                     pause_isolates_on_start, pause_isolates_on_exit));