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

services/dart/content_handler_app.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "services/dart/content_handler_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
@@ skipping 188 matching lines @@
         mojo::ContentHandlerFactory::GetInterfaceRequestHandler(
             &strict_content_handler_));
   } else {
     service_provider_impl->AddService<mojo::ContentHandler>(
         mojo::ContentHandlerFactory::GetInterfaceRequestHandler(
             &content_handler_));
   }
   return true;
 }
 
-scoped_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
+std::unique_ptr<mojo::ContentHandlerFactory::HandledApplicationHolder>
 DartContentHandler::CreateApplication(
     mojo::InterfaceRequest<mojo::Application> application_request,
     mojo::URLResponsePtr response) {
   base::trace_event::TraceLog::GetInstance()
       ->SetCurrentThreadBlocksMessageLoop();
 
   TRACE_EVENT1("dart_content_handler", "DartContentHandler::CreateApplication",
                "url", response->url.get());
 
   const bool run_on_message_loop = app_->run_on_message_loop();
@@ skipping 17 matching lines @@
     handler_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(
             &DartContentHandlerApp::ExtractApplication, base::Unretained(app_),
             base::Unretained(&application_dir), base::Passed(response.Pass()),
             base::Bind(
                 base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask),
                 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));
   }
 }
 
 }  // namespace dart