Replace scoped_ptr with unique_ptr in webrtc/media/
BUG=webrtc:5520
Review URL: https://codereview.webrtc.org/1728503002
Cr-Commit-Position: refs/heads/master@{#11779}
diff --git a/webrtc/media/base/rtpdataengine.h b/webrtc/media/base/rtpdataengine.h
index 39f5ade..8636435 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 @@
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 @@
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