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

Unified Diff: webrtc/pc/channelmanager.h

Issue 1783263002: Replace scoped_ptr with unique_ptr in webrtc/pc/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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 | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 89b9e1d4eb076862f7570b12e2b7b81a4b1430bb..72a2f056b5a4c0b6bb797f1a5792f575bb8a9ee3 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -11,6 +11,7 @@
#ifndef WEBRTC_PC_CHANNELMANAGER_H_
#define WEBRTC_PC_CHANNELMANAGER_H_
+#include <memory>
#include <string>
#include <vector>
@@ -161,8 +162,8 @@ class ChannelManager {
DataChannelType data_channel_type);
void DestroyDataChannel_w(DataChannel* data_channel);
- rtc::scoped_ptr<MediaEngineInterface> media_engine_;
- rtc::scoped_ptr<DataEngineInterface> data_media_engine_;
+ std::unique_ptr<MediaEngineInterface> media_engine_;
+ std::unique_ptr<DataEngineInterface> data_media_engine_;
bool initialized_;
rtc::Thread* main_thread_;
rtc::Thread* worker_thread_;
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/mediasession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698