Convert //remoting to use std::unique_ptr

remoting/host/ipc_desktop_environment.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/ipc_desktop_environment.h"
 
 #include <utility>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/process/process_handle.h"
 #include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "ipc/ipc_sender.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/desktop_session.h"
 #include "remoting/host/desktop_session_proxy.h"
 #include "remoting/host/input_injector.h"
@@ skipping 14 matching lines @@
   DCHECK(caller_task_runner->BelongsToCurrentThread());
 
   desktop_session_proxy_ = new DesktopSessionProxy(
       audio_task_runner, caller_task_runner, io_task_runner,
       client_session_control, desktop_session_connector, virtual_terminal,
       supports_touch_events);
 }
 
 IpcDesktopEnvironment::~IpcDesktopEnvironment() {}
 
-scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
+std::unique_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
   return desktop_session_proxy_->CreateAudioCapturer();
 }
 
-scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
+std::unique_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector() {
   return desktop_session_proxy_->CreateInputInjector();
 }
 
-scoped_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
+std::unique_ptr<ScreenControls> IpcDesktopEnvironment::CreateScreenControls() {
   return desktop_session_proxy_->CreateScreenControls();
 }
 
-scoped_ptr<webrtc::MouseCursorMonitor>
+std::unique_ptr<webrtc::MouseCursorMonitor>
 IpcDesktopEnvironment::CreateMouseCursorMonitor() {
   return desktop_session_proxy_->CreateMouseCursorMonitor();
 }
 
-scoped_ptr<webrtc::DesktopCapturer>
+std::unique_ptr<webrtc::DesktopCapturer>
 IpcDesktopEnvironment::CreateVideoCapturer() {
   return desktop_session_proxy_->CreateVideoCapturer();
 }
 
 std::string IpcDesktopEnvironment::GetCapabilities() const {
   return desktop_session_proxy_->GetCapabilities();
 }
 
 void IpcDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
   return desktop_session_proxy_->SetCapabilities(capabilities);
 }
 
 IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
     IPC::Sender* daemon_channel)
     : audio_task_runner_(audio_task_runner),
       caller_task_runner_(caller_task_runner),
       io_task_runner_(io_task_runner),
       daemon_channel_(daemon_channel),
       connector_factory_(this) {}
 
 IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {}
 
-scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
+std::unique_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
     base::WeakPtr<ClientSessionControl> client_session_control) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
-  return make_scoped_ptr(new IpcDesktopEnvironment(
+  return base::WrapUnique(new IpcDesktopEnvironment(
       audio_task_runner_, caller_task_runner_, io_task_runner_,
       client_session_control, connector_factory_.GetWeakPtr(), curtain_enabled_,
       supports_touch_events_));
 }
 
 void IpcDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   curtain_enabled_ = enable;
 }
@@ skipping 94 matching lines @@
   if (i != active_connections_.end()) {
     DesktopSessionProxy* desktop_session_proxy = i->second;
     active_connections_.erase(i);
 
     // Disconnect the client session.
     desktop_session_proxy->DisconnectSession(protocol::OK);
   }
 }
 
 }  // namespace remoting