Index: remoting/host/setup/daemon_controller_delegate_linux.h |
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.h b/remoting/host/setup/daemon_controller_delegate_linux.h |
index 9bcc81cb260fec570596d5c22d0b97d556766633..eee983953a50c6cf77d7e7e8c8fc5dc62c8a20cc 100644 |
--- a/remoting/host/setup/daemon_controller_delegate_linux.h |
+++ b/remoting/host/setup/daemon_controller_delegate_linux.h |
@@ -5,8 +5,9 @@ |
#ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_LINUX_H_ |
#define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_LINUX_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "remoting/host/setup/daemon_controller.h" |
namespace remoting { |
@@ -18,12 +19,12 @@ class DaemonControllerDelegateLinux : public DaemonController::Delegate { |
// DaemonController::Delegate interface. |
DaemonController::State GetState() override; |
- scoped_ptr<base::DictionaryValue> GetConfig() override; |
+ std::unique_ptr<base::DictionaryValue> GetConfig() override; |
void SetConfigAndStart( |
- scoped_ptr<base::DictionaryValue> config, |
+ std::unique_ptr<base::DictionaryValue> config, |
bool consent, |
const DaemonController::CompletionCallback& done) override; |
- void UpdateConfig(scoped_ptr<base::DictionaryValue> config, |
+ void UpdateConfig(std::unique_ptr<base::DictionaryValue> config, |
const DaemonController::CompletionCallback& done) override; |
void Stop(const DaemonController::CompletionCallback& done) override; |
DaemonController::UsageStatsConsent GetUsageStatsConsent() override; |