Index: remoting/host/touch_injector_win.cc |
diff --git a/remoting/host/touch_injector_win.cc b/remoting/host/touch_injector_win.cc |
index 6c7c262d65b55b0a8199558e69eea8deb308d14e..4d9074704423b24a4500fbc19f69de1217fba793 100644 |
--- a/remoting/host/touch_injector_win.cc |
+++ b/remoting/host/touch_injector_win.cc |
@@ -86,11 +86,11 @@ void ConvertToPointerTouchInfo( |
TouchInjectorWinDelegate::~TouchInjectorWinDelegate() {} |
// static. |
-scoped_ptr<TouchInjectorWinDelegate> TouchInjectorWinDelegate::Create() { |
+std::unique_ptr<TouchInjectorWinDelegate> TouchInjectorWinDelegate::Create() { |
base::ScopedNativeLibrary library(base::FilePath(L"User32.dll")); |
if (!library.is_valid()) { |
PLOG(INFO) << "Failed to get library module for touch injection functions."; |
- return scoped_ptr<TouchInjectorWinDelegate>(); |
+ return std::unique_ptr<TouchInjectorWinDelegate>(); |
} |
InitializeTouchInjectionFunction init_func = |
@@ -98,7 +98,7 @@ scoped_ptr<TouchInjectorWinDelegate> TouchInjectorWinDelegate::Create() { |
library.GetFunctionPointer("InitializeTouchInjection")); |
if (!init_func) { |
PLOG(INFO) << "Failed to get InitializeTouchInjection function handle."; |
- return scoped_ptr<TouchInjectorWinDelegate>(); |
+ return std::unique_ptr<TouchInjectorWinDelegate>(); |
} |
InjectTouchInputFunction inject_touch_func = |
@@ -106,12 +106,11 @@ scoped_ptr<TouchInjectorWinDelegate> TouchInjectorWinDelegate::Create() { |
library.GetFunctionPointer("InjectTouchInput")); |
if (!inject_touch_func) { |
PLOG(INFO) << "Failed to get InjectTouchInput."; |
- return scoped_ptr<TouchInjectorWinDelegate>(); |
+ return std::unique_ptr<TouchInjectorWinDelegate>(); |
} |
- return scoped_ptr<TouchInjectorWinDelegate>( |
- new TouchInjectorWinDelegate( |
- library.Release(), init_func, inject_touch_func)); |
+ return std::unique_ptr<TouchInjectorWinDelegate>(new TouchInjectorWinDelegate( |
+ library.Release(), init_func, inject_touch_func)); |
} |
TouchInjectorWinDelegate::TouchInjectorWinDelegate( |
@@ -190,7 +189,7 @@ void TouchInjectorWin::InjectTouchEvent(const TouchEvent& event) { |
} |
void TouchInjectorWin::SetInjectorDelegateForTest( |
- scoped_ptr<TouchInjectorWinDelegate> functions) { |
+ std::unique_ptr<TouchInjectorWinDelegate> functions) { |
delegate_ = std::move(functions); |
} |