Convert //services from scoped_ptr to std::unique_ptr

services/user/user_shell_client.cc

 // Copyright 2016 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/user/user_shell_client.h"
 
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "components/filesystem/lock_table.h"
 #include "components/leveldb/leveldb_service_impl.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/user/user_id_map.h"
 #include "services/user/user_service.h"
 
 namespace user_service {
 
@@ skipping 38 matching lines @@
                                leveldb::LevelDBServiceRequest request) {
     if (!leveldb_service_)
       leveldb_service_.reset(new leveldb::LevelDBServiceImpl(task_runner_));
     leveldb_bindings_.AddBinding(leveldb_service_.get(), std::move(request));
   }
 
  private:
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Variables that are only accessible on the |leveldb_service_runner_| thread.
-  scoped_ptr<leveldb::LevelDBService> leveldb_service_;
+  std::unique_ptr<leveldb::LevelDBService> leveldb_service_;
   mojo::BindingSet<leveldb::LevelDBService> leveldb_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBServiceObjects);
 };
 
-scoped_ptr<shell::ShellClient> CreateUserShellClient(
+std::unique_ptr<shell::ShellClient> CreateUserShellClient(
     scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner) {
-  return make_scoped_ptr(new UserShellClient(std::move(user_service_runner),
-                                     std::move(leveldb_service_runner)));
+  return base::WrapUnique(new UserShellClient(
+      std::move(user_service_runner), std::move(leveldb_service_runner)));
 }
 
 UserShellClient::UserShellClient(
     scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner)
     : user_service_runner_(std::move(user_service_runner)),
       leveldb_service_runner_(std::move(leveldb_service_runner)) {}
 
 UserShellClient::~UserShellClient() {
   user_service_runner_->DeleteSoon(FROM_HERE, user_objects_.release());
@@ skipping 29 matching lines @@
                              leveldb::LevelDBServiceRequest request) {
   leveldb_service_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &UserShellClient::LevelDBServiceObjects::OnLevelDBServiceRequest,
           leveldb_objects_->AsWeakPtr(), connection,
           base::Passed(&request)));
 }
 
 }  // namespace user_service