OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/host_mock_objects.h" | 5 #include "remoting/host/host_mock_objects.h" |
6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
7 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
8 #include "net/base/ip_endpoint.h" | 9 #include "net/base/ip_endpoint.h" |
9 #include "remoting/base/auto_thread_task_runner.h" | 10 #include "remoting/base/auto_thread_task_runner.h" |
10 #include "remoting/codec/audio_encoder.h" | 11 #include "remoting/codec/audio_encoder.h" |
11 #include "remoting/codec/video_encoder.h" | 12 #include "remoting/codec/video_encoder.h" |
12 #include "remoting/host/audio_capturer.h" | 13 #include "remoting/host/audio_capturer.h" |
13 #include "remoting/host/input_injector.h" | 14 #include "remoting/host/input_injector.h" |
14 #include "remoting/proto/event.pb.h" | 15 #include "remoting/proto/event.pb.h" |
15 #include "remoting/proto/video.pb.h" | 16 #include "remoting/proto/video.pb.h" |
16 #include "remoting/protocol/transport.h" | 17 #include "remoting/protocol/transport.h" |
17 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" | 18 #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" |
18 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 19 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
19 | 20 |
20 namespace remoting { | 21 namespace remoting { |
21 | 22 |
22 MockDesktopEnvironment::MockDesktopEnvironment() {} | 23 MockDesktopEnvironment::MockDesktopEnvironment() {} |
23 | 24 |
24 MockDesktopEnvironment::~MockDesktopEnvironment() {} | 25 MockDesktopEnvironment::~MockDesktopEnvironment() {} |
25 | 26 |
26 scoped_ptr<AudioCapturer> MockDesktopEnvironment::CreateAudioCapturer() { | 27 std::unique_ptr<AudioCapturer> MockDesktopEnvironment::CreateAudioCapturer() { |
27 return make_scoped_ptr(CreateAudioCapturerPtr()); | 28 return base::WrapUnique(CreateAudioCapturerPtr()); |
28 } | 29 } |
29 | 30 |
30 scoped_ptr<InputInjector> MockDesktopEnvironment::CreateInputInjector() { | 31 std::unique_ptr<InputInjector> MockDesktopEnvironment::CreateInputInjector() { |
31 return make_scoped_ptr(CreateInputInjectorPtr()); | 32 return base::WrapUnique(CreateInputInjectorPtr()); |
32 } | 33 } |
33 | 34 |
34 scoped_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() { | 35 std::unique_ptr<ScreenControls> MockDesktopEnvironment::CreateScreenControls() { |
35 return make_scoped_ptr(CreateScreenControlsPtr()); | 36 return base::WrapUnique(CreateScreenControlsPtr()); |
36 } | 37 } |
37 | 38 |
38 scoped_ptr<webrtc::DesktopCapturer> | 39 std::unique_ptr<webrtc::DesktopCapturer> |
39 MockDesktopEnvironment::CreateVideoCapturer() { | 40 MockDesktopEnvironment::CreateVideoCapturer() { |
40 return make_scoped_ptr(CreateVideoCapturerPtr()); | 41 return base::WrapUnique(CreateVideoCapturerPtr()); |
41 } | 42 } |
42 | 43 |
43 scoped_ptr<webrtc::MouseCursorMonitor> | 44 std::unique_ptr<webrtc::MouseCursorMonitor> |
44 MockDesktopEnvironment::CreateMouseCursorMonitor() { | 45 MockDesktopEnvironment::CreateMouseCursorMonitor() { |
45 return make_scoped_ptr(CreateMouseCursorMonitorPtr()); | 46 return base::WrapUnique(CreateMouseCursorMonitorPtr()); |
46 } | 47 } |
47 | 48 |
48 MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory() {} | 49 MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory() {} |
49 | 50 |
50 MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {} | 51 MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {} |
51 | 52 |
52 scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create( | 53 std::unique_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create( |
53 base::WeakPtr<ClientSessionControl> client_session_control) { | 54 base::WeakPtr<ClientSessionControl> client_session_control) { |
54 return make_scoped_ptr(CreatePtr()); | 55 return base::WrapUnique(CreatePtr()); |
55 } | 56 } |
56 | 57 |
57 MockInputInjector::MockInputInjector() {} | 58 MockInputInjector::MockInputInjector() {} |
58 | 59 |
59 MockInputInjector::~MockInputInjector() {} | 60 MockInputInjector::~MockInputInjector() {} |
60 | 61 |
61 void MockInputInjector::Start( | 62 void MockInputInjector::Start( |
62 scoped_ptr<protocol::ClipboardStub> client_clipboard) { | 63 std::unique_ptr<protocol::ClipboardStub> client_clipboard) { |
63 StartPtr(client_clipboard.get()); | 64 StartPtr(client_clipboard.get()); |
64 } | 65 } |
65 | 66 |
66 MockClientSessionControl::MockClientSessionControl() {} | 67 MockClientSessionControl::MockClientSessionControl() {} |
67 | 68 |
68 MockClientSessionControl::~MockClientSessionControl() {} | 69 MockClientSessionControl::~MockClientSessionControl() {} |
69 | 70 |
70 MockClientSessionEventHandler::MockClientSessionEventHandler() {} | 71 MockClientSessionEventHandler::MockClientSessionEventHandler() {} |
71 | 72 |
72 MockClientSessionEventHandler::~MockClientSessionEventHandler() {} | 73 MockClientSessionEventHandler::~MockClientSessionEventHandler() {} |
(...skipping 14 matching lines...) Expand all Loading... |
87 const GnubbyAuthHandler::SendMessageCallback& | 88 const GnubbyAuthHandler::SendMessageCallback& |
88 MockGnubbyAuthHandler::GetSendMessageCallback() { | 89 MockGnubbyAuthHandler::GetSendMessageCallback() { |
89 return callback_; | 90 return callback_; |
90 } | 91 } |
91 | 92 |
92 MockMouseCursorMonitor::MockMouseCursorMonitor() {} | 93 MockMouseCursorMonitor::MockMouseCursorMonitor() {} |
93 | 94 |
94 MockMouseCursorMonitor::~MockMouseCursorMonitor() {} | 95 MockMouseCursorMonitor::~MockMouseCursorMonitor() {} |
95 | 96 |
96 } // namespace remoting | 97 } // namespace remoting |
OLD | NEW |