Convert //remoting to use std::unique_ptr

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 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 "remoting/host/chromoting_host.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/host_stub.h"
@@ skipping 32 matching lines @@
   -1,
 
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
 }  // namespace
 
 ChromotingHost::ChromotingHost(
     DesktopEnvironmentFactory* desktop_environment_factory,
-    scoped_ptr<protocol::SessionManager> session_manager,
+    std::unique_ptr<protocol::SessionManager> session_manager,
     scoped_refptr<protocol::TransportContext> transport_context,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner)
     : desktop_environment_factory_(desktop_environment_factory),
       session_manager_(std::move(session_manager)),
       transport_context_(transport_context),
       audio_task_runner_(audio_task_runner),
       video_encode_task_runner_(video_encode_task_runner),
       started_(false),
       login_backoff_(&kDefaultBackoffPolicy),
@@ skipping 35 matching lines @@
 void ChromotingHost::AddStatusObserver(HostStatusObserver* observer) {
   DCHECK(CalledOnValidThread());
   status_observers_.AddObserver(observer);
 }
 
 void ChromotingHost::RemoveStatusObserver(HostStatusObserver* observer) {
   DCHECK(CalledOnValidThread());
   status_observers_.RemoveObserver(observer);
 }
 
-void ChromotingHost::AddExtension(scoped_ptr<HostExtension> extension) {
+void ChromotingHost::AddExtension(std::unique_ptr<HostExtension> extension) {
   extensions_.push_back(extension.release());
 }
 
 void ChromotingHost::SetAuthenticatorFactory(
-    scoped_ptr<protocol::AuthenticatorFactory> authenticator_factory) {
+    std::unique_ptr<protocol::AuthenticatorFactory> authenticator_factory) {
   DCHECK(CalledOnValidThread());
   session_manager_->set_authenticator_factory(std::move(authenticator_factory));
 }
 
 void ChromotingHost::SetEnableCurtaining(bool enable) {
   DCHECK(CalledOnValidThread());
 
   if (enable_curtaining_ == enable)
     return;
 
@@ skipping 116 matching lines @@
     *response = protocol::SessionManager::OVERLOAD;
     return;
   }
 
   *response = protocol::SessionManager::ACCEPT;
 
   HOST_LOG << "Client connected: " << session->jid();
 
   // Create either IceConnectionToClient or WebrtcConnectionToClient.
   // TODO(sergeyu): Move this logic to the protocol layer.
-  scoped_ptr<protocol::ConnectionToClient> connection;
+  std::unique_ptr<protocol::ConnectionToClient> connection;
   if (session->config().protocol() ==
       protocol::SessionConfig::Protocol::WEBRTC) {
     connection.reset(new protocol::WebrtcConnectionToClient(
-        make_scoped_ptr(session), transport_context_));
+        base::WrapUnique(session), transport_context_));
   } else {
     connection.reset(new protocol::IceConnectionToClient(
-        make_scoped_ptr(session), transport_context_,
+        base::WrapUnique(session), transport_context_,
         video_encode_task_runner_));
   }
 
   // Create a ClientSession object.
   ClientSession* client =
       new ClientSession(this, audio_task_runner_, std::move(connection),
                         desktop_environment_factory_, max_session_duration_,
                         pairing_registry_, extensions_.get());
 
   clients_.push_back(client);
 }
 
 void ChromotingHost::DisconnectAllClients() {
   DCHECK(CalledOnValidThread());
 
   while (!clients_.empty()) {
     size_t size = clients_.size();
     clients_.front()->DisconnectSession(protocol::OK);
     CHECK_EQ(clients_.size(), size - 1);
   }
 }
 
 }  // namespace remoting