Index: remoting/host/setup/daemon_controller_delegate_mac.h |
diff --git a/remoting/host/setup/daemon_controller_delegate_mac.h b/remoting/host/setup/daemon_controller_delegate_mac.h |
index 7ae6c57d5d4a67c78563623138a5a65886a3d4a1..d85f186c1268409bca8f3415a1a6e4ee77712436 100644 |
--- a/remoting/host/setup/daemon_controller_delegate_mac.h |
+++ b/remoting/host/setup/daemon_controller_delegate_mac.h |
@@ -5,9 +5,12 @@ |
#ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_MAC_H_ |
#define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_MAC_H_ |
+#include <CoreFoundation/CoreFoundation.h> |
+ |
+#include <memory> |
+ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "remoting/host/setup/daemon_controller.h" |
namespace remoting { |
@@ -19,12 +22,12 @@ class DaemonControllerDelegateMac : 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; |