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

services/js/content_handler_main.cc

Index: services/js/content_handler_main.cc
diff --git a/services/js/content_handler_main.cc b/services/js/content_handler_main.cc
index dfd1610f2aee961bdced04664f78ea64ccbba33c..9cafa0180d16c1b03ef1c3e46cea1f8b35609626 100644
--- a/services/js/content_handler_main.cc
+++ b/services/js/content_handler_main.cc
@@ -38,11 +38,12 @@ class JsContentHandler : public mojo::ApplicationImplBase,
   }
 
   // Overridden from mojo::ContentHandlerFactory::ManagedDelegate:
-  scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
+  std::unique_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
   CreateApplication(
       mojo::InterfaceRequest<mojo::Application> application_request,
       mojo::URLResponsePtr response) override {
-    return make_scoped_ptr(
+    return std::unique_ptr<
+        mojo::ContentHandlerFactory::HandledApplicationHolder>(
         new JSApp(application_request.Pass(), response.Pass()));
   }