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

Unified Diff: webrtc/media/base/hybriddataengine.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 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
« no previous file with comments | « webrtc/media/base/fakevideocapturer.h ('k') | webrtc/media/base/mediachannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/hybriddataengine.h
diff --git a/webrtc/media/base/hybriddataengine.h b/webrtc/media/base/hybriddataengine.h
index f2e019952d71a2422cdc4cb8d167b5bb50327e05..508210b8c5bb060afe8a7d2f2a885b11d1b6454a 100644
--- a/webrtc/media/base/hybriddataengine.h
+++ b/webrtc/media/base/hybriddataengine.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_
#define WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_
+#include <memory>
#include <string>
#include <vector>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/mediaengine.h"
@@ -49,8 +49,8 @@ class HybridDataEngine : public DataEngineInterface {
virtual const std::vector<DataCodec>& data_codecs() { return codecs_; }
private:
- rtc::scoped_ptr<DataEngineInterface> first_;
- rtc::scoped_ptr<DataEngineInterface> second_;
+ std::unique_ptr<DataEngineInterface> first_;
+ std::unique_ptr<DataEngineInterface> second_;
std::vector<DataCodec> codecs_;
};
« no previous file with comments | « webrtc/media/base/fakevideocapturer.h ('k') | webrtc/media/base/mediachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698