| Index: remoting/host/sas_injector_win.cc
|
| diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc
|
| index fcf2de6af6ce2620f66ad852e62224a9e5d39a73..17315559af57b78230f196ca5b5d2da2c2ee8486 100644
|
| --- a/remoting/host/sas_injector_win.cc
|
| +++ b/remoting/host/sas_injector_win.cc
|
| @@ -5,11 +5,13 @@
|
| #include "remoting/host/sas_injector.h"
|
|
|
| #include <windows.h>
|
| +
|
| #include <string>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/path_service.h"
|
| #include "base/scoped_native_library.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -188,7 +190,7 @@ bool SasInjectorXp::InjectSas() {
|
| const wchar_t kSasWindowClassName[] = L"SAS window class";
|
| const wchar_t kSasWindowTitle[] = L"SAS window";
|
|
|
| - scoped_ptr<webrtc::Desktop> winlogon_desktop(
|
| + std::unique_ptr<webrtc::Desktop> winlogon_desktop(
|
| webrtc::Desktop::GetDesktop(kWinlogonDesktopName));
|
| if (!winlogon_desktop.get()) {
|
| PLOG(ERROR) << "Failed to open '" << kWinlogonDesktopName << "' desktop";
|
| @@ -219,11 +221,11 @@ bool SasInjectorXp::InjectSas() {
|
| return true;
|
| }
|
|
|
| -scoped_ptr<SasInjector> SasInjector::Create() {
|
| +std::unique_ptr<SasInjector> SasInjector::Create() {
|
| if (base::win::GetVersion() < base::win::VERSION_VISTA) {
|
| - return make_scoped_ptr(new SasInjectorXp());
|
| + return base::WrapUnique(new SasInjectorXp());
|
| } else {
|
| - return make_scoped_ptr(new SasInjectorWin());
|
| + return base::WrapUnique(new SasInjectorWin());
|
| }
|
| }
|
|
|
|
|