Chromium Code Reviews| Index: webrtc/pc/channelmanager.h |
| diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h |
| index 879ea4d39b8194e27166b4379fbf20b87c8c68cd..739f2d92908ae9d49ecdab2fc4e947855e7d3d93 100644 |
| --- a/webrtc/pc/channelmanager.h |
| +++ b/webrtc/pc/channelmanager.h |
| @@ -39,12 +39,12 @@ class ChannelManager { |
| public: |
| // For testing purposes. Allows the media engine and data media |
| // engine and dev manager to be mocks. The ChannelManager takes |
| - // ownership of these objects. |
| - ChannelManager(MediaEngineInterface* me, |
| - DataEngineInterface* dme, |
| + // ownership of the objects passed in as unique_ptrs. |
|
pthatcher1
2017/02/10 18:21:25
Isn't that kind of assumed by a std::unique_ptr?
Taylor Brandstetter
2017/02/10 21:55:48
Removed.
|
| + ChannelManager(std::unique_ptr<MediaEngineInterface> me, |
| + std::unique_ptr<DataEngineInterface> dme, |
| rtc::Thread* worker_and_network); |
| // Same as above, but gives an easier default DataEngine. |
| - ChannelManager(MediaEngineInterface* me, |
| + ChannelManager(std::unique_ptr<MediaEngineInterface> me, |
| rtc::Thread* worker, |
| rtc::Thread* network); |
| ~ChannelManager(); |
| @@ -157,8 +157,8 @@ class ChannelManager { |
| typedef std::vector<VideoChannel*> VideoChannels; |
| typedef std::vector<RtpDataChannel*> RtpDataChannels; |
| - void Construct(MediaEngineInterface* me, |
| - DataEngineInterface* dme, |
| + void Construct(std::unique_ptr<MediaEngineInterface> me, |
| + std::unique_ptr<DataEngineInterface> dme, |
| rtc::Thread* worker_thread, |
| rtc::Thread* network_thread); |
| bool InitMediaEngine_w(); |