Index: remoting/host/fake_desktop_environment.h |
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h |
index b1bc6b48d60e73db877d2181de21ce601f9b66af..29910012454de00432f3b92dedbf8f2c4edec633 100644 |
--- a/remoting/host/fake_desktop_environment.h |
+++ b/remoting/host/fake_desktop_environment.h |
@@ -20,7 +20,8 @@ class FakeInputInjector : public InputInjector, |
FakeInputInjector(); |
~FakeInputInjector() override; |
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override; |
+ void Start( |
+ std::unique_ptr<protocol::ClipboardStub> client_clipboard) override; |
void InjectKeyEvent(const protocol::KeyEvent& event) override; |
void InjectTextEvent(const protocol::TextEvent& event) override; |
void InjectMouseEvent(const protocol::MouseEvent& event) override; |
@@ -76,11 +77,12 @@ class FakeDesktopEnvironment |
} |
// DesktopEnvironment implementation. |
- scoped_ptr<AudioCapturer> CreateAudioCapturer() override; |
- scoped_ptr<InputInjector> CreateInputInjector() override; |
- scoped_ptr<ScreenControls> CreateScreenControls() override; |
- scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
- scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() override; |
+ std::unique_ptr<AudioCapturer> CreateAudioCapturer() override; |
+ std::unique_ptr<InputInjector> CreateInputInjector() override; |
+ std::unique_ptr<ScreenControls> CreateScreenControls() override; |
+ std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
+ std::unique_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor() |
+ override; |
std::string GetCapabilities() const override; |
void SetCapabilities(const std::string& capabilities) override; |
@@ -109,7 +111,7 @@ class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory { |
} |
// DesktopEnvironmentFactory implementation. |
- scoped_ptr<DesktopEnvironment> Create( |
+ std::unique_ptr<DesktopEnvironment> Create( |
base::WeakPtr<ClientSessionControl> client_session_control) override; |
void SetEnableCurtaining(bool enable) override; |
bool SupportsAudioCapture() const override; |