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

Unified Diff: webrtc/pc/channelmanager.h

Issue 2685093002: Switching some interfaces to use std::unique_ptr<>. (Closed)
Patch Set: Rebase onto master Created 3 years, 10 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
Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 879ea4d39b8194e27166b4379fbf20b87c8c68cd..052c363486aa0708bcc0bfcca70fe360269d5b1c 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -38,13 +38,12 @@ class VoiceChannel;
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,
+ // engine and dev manager to be mocks.
+ 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 +156,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();

Powered by Google App Engine
This is Rietveld 408576698