Index: remoting/host/me2me_desktop_environment.cc |
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc |
index 0a6d37dc804542e994b1036a6779af31b978a49b..35723dbc641e847722b93fa0a463ec821f0f9924 100644 |
--- a/remoting/host/me2me_desktop_environment.cc |
+++ b/remoting/host/me2me_desktop_environment.cc |
@@ -7,6 +7,7 @@ |
#include <utility> |
#include "base/logging.h" |
+#include "base/memory/ptr_util.h" |
#include "base/single_thread_task_runner.h" |
#include "build/build_config.h" |
#include "remoting/base/logging.h" |
@@ -34,10 +35,11 @@ Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
} |
-scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() { |
+std::unique_ptr<ScreenControls> |
+Me2MeDesktopEnvironment::CreateScreenControls() { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
- return make_scoped_ptr(new ResizingHostObserver(DesktopResizer::Create())); |
+ return base::WrapUnique(new ResizingHostObserver(DesktopResizer::Create())); |
} |
std::string Me2MeDesktopEnvironment::GetCapabilities() const { |
@@ -132,11 +134,11 @@ Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { |
} |
-scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
+std::unique_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
base::WeakPtr<ClientSessionControl> client_session_control) { |
DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
- scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( |
+ std::unique_ptr<Me2MeDesktopEnvironment> desktop_environment( |
new Me2MeDesktopEnvironment( |
caller_task_runner(), video_capture_task_runner(), |
input_task_runner(), ui_task_runner(), supports_touch_events())); |