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

Unified Diff: webrtc/media/base/rtpdataengine.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/mediachannel.h ('k') | webrtc/media/base/rtpdataengine_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/rtpdataengine.h
diff --git a/webrtc/media/base/rtpdataengine.h b/webrtc/media/base/rtpdataengine.h
index 39f5ade0532d68f645b51537066026c0fba5f3a8..8636435f654bbfbbe5b4351e59b1101ab7213792 100644
--- a/webrtc/media/base/rtpdataengine.h
+++ b/webrtc/media/base/rtpdataengine.h
@@ -11,6 +11,7 @@
#ifndef WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
#define WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
+#include <memory>
#include <string>
#include <vector>
@@ -40,7 +41,7 @@ class RtpDataEngine : public DataEngineInterface {
private:
std::vector<DataCodec> data_codecs_;
- rtc::scoped_ptr<rtc::Timing> timing_;
+ std::unique_ptr<rtc::Timing> timing_;
};
// Keep track of sequence number and timestamp of an RTP stream. The
@@ -116,7 +117,7 @@ class RtpDataMediaChannel : public DataMediaChannel {
std::vector<StreamParams> send_streams_;
std::vector<StreamParams> recv_streams_;
std::map<uint32_t, RtpClock*> rtp_clock_by_send_ssrc_;
- rtc::scoped_ptr<rtc::RateLimiter> send_limiter_;
+ std::unique_ptr<rtc::RateLimiter> send_limiter_;
};
} // namespace cricket
« no previous file with comments | « webrtc/media/base/mediachannel.h ('k') | webrtc/media/base/rtpdataengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698