Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: remoting/host/host_mock_objects.h

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/host_extension_session_manager.cc ('k') | remoting/host/host_mock_objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index 1eb8ca1f29e1b7969dc7e2aefed7c75a52845d73..770045eaeb19386ae2a8cafff59a59e0c3c9cc50 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -45,11 +45,11 @@ class MockDesktopEnvironment : public DesktopEnvironment {
MOCK_METHOD1(SetCapabilities, void(const std::string&));
// 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()
+ 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;
};
@@ -95,7 +95,7 @@ class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
MOCK_METHOD0(CreatePtr, DesktopEnvironment*());
MOCK_CONST_METHOD0(SupportsAudioCapture, bool());
- scoped_ptr<DesktopEnvironment> Create(
+ std::unique_ptr<DesktopEnvironment> Create(
base::WeakPtr<ClientSessionControl> client_session_control) override;
private:
@@ -116,7 +116,7 @@ class MockInputInjector : public InputInjector {
MOCK_METHOD1(StartPtr,
void(protocol::ClipboardStub* client_clipboard));
- void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard);
+ void Start(std::unique_ptr<protocol::ClipboardStub> client_clipboard);
private:
DISALLOW_COPY_AND_ASSIGN(MockInputInjector);
« no previous file with comments | « remoting/host/host_extension_session_manager.cc ('k') | remoting/host/host_mock_objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698