Index: remoting/host/desktop_process_main.cc |
diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc |
index 7116580f75020ddb531a7a41dee596ef7b2e3e7d..825a5f53a3367a8676c04e2810591927dea4f0fe 100644 |
--- a/remoting/host/desktop_process_main.cc |
+++ b/remoting/host/desktop_process_main.cc |
@@ -5,12 +5,12 @@ |
// This file implements the Windows service controlling Me2Me host processes |
// running within user sessions. |
+#include <memory> |
#include <utility> |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/command_line.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/run_loop.h" |
#include "build/build_config.h" |
@@ -54,7 +54,7 @@ int DesktopProcessMain() { |
channel_name); |
// Create a platform-dependent environment factory. |
- scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory; |
+ std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory; |
#if defined(OS_WIN) |
desktop_environment_factory.reset(new SessionDesktopEnvironmentFactory( |
ui_task_runner, video_capture_task_runner, input_task_runner, |