Convert //remoting to use std::unique_ptr

remoting/host/host_mock_objects.cc

Index: remoting/host/host_mock_objects.cc
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc
index 16d12d64636433baa3bccc218df888f28a330b50..dbb2ac8bf1f700394fa5bedafea472d335a3fe64 100644
--- a/remoting/host/host_mock_objects.cc
+++ b/remoting/host/host_mock_objects.cc
@@ -4,6 +4,7 @@
 
 #include "remoting/host/host_mock_objects.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "net/base/ip_endpoint.h"
 #include "remoting/base/auto_thread_task_runner.h"
@@ -23,35 +24,35 @@ MockDesktopEnvironment::MockDesktopEnvironment() {}
 
 MockDesktopEnvironment::~MockDesktopEnvironment() {}
 
-scoped_ptr<AudioCapturer> MockDesktopEnvironment::CreateAudioCapturer() {
-  return make_scoped_ptr(CreateAudioCapturerPtr());
+std::unique_ptr<AudioCapturer> MockDesktopEnvironment::CreateAudioCapturer() {
+  return base::WrapUnique(CreateAudioCapturerPtr());
 }
 
-scoped_ptr<InputInjector> MockDesktopEnvironment::CreateInputInjector() {
-  return make_scoped_ptr(CreateInputInjectorPtr());
+std::unique_ptr<InputInjector> MockDesktopEnvironment::CreateInputInjector() {
+  return base::WrapUnique(CreateInputInjectorPtr());
 }
 
-scoped_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() {
-  return make_scoped_ptr(CreateScreenControlsPtr());
+std::unique_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() {
+  return base::WrapUnique(CreateScreenControlsPtr());
 }
 
-scoped_ptr<webrtc::DesktopCapturer>
+std::unique_ptr<webrtc::DesktopCapturer>
 MockDesktopEnvironment::CreateVideoCapturer() {
-  return make_scoped_ptr(CreateVideoCapturerPtr());
+  return base::WrapUnique(CreateVideoCapturerPtr());
 }
 
-scoped_ptr<webrtc::MouseCursorMonitor>
+std::unique_ptr<webrtc::MouseCursorMonitor>
 MockDesktopEnvironment::CreateMouseCursorMonitor() {
-  return make_scoped_ptr(CreateMouseCursorMonitorPtr());
+  return base::WrapUnique(CreateMouseCursorMonitorPtr());
 }
 
 MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory() {}
 
 MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {}
 
-scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create(
+std::unique_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create(
     base::WeakPtr<ClientSessionControl> client_session_control) {
-  return make_scoped_ptr(CreatePtr());
+  return base::WrapUnique(CreatePtr());
 }
 
 MockInputInjector::MockInputInjector() {}
@@ -59,7 +60,7 @@ MockInputInjector::MockInputInjector() {}
 MockInputInjector::~MockInputInjector() {}
 
 void MockInputInjector::Start(
-    scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+    std::unique_ptr<protocol::ClipboardStub> client_clipboard) {
   StartPtr(client_clipboard.get());
 }