Index: chrome/renderer/media/cast_transport_ipc.h |
diff --git a/chrome/renderer/media/cast_transport_ipc.h b/chrome/renderer/media/cast_transport_ipc.h |
index 4fe22e35d335538ba50327bd8a60ca81420059d7..1a4f0729ca5c43ebd7741baca5ac5702429d72cf 100644 |
--- a/chrome/renderer/media/cast_transport_ipc.h |
+++ b/chrome/renderer/media/cast_transport_ipc.h |
@@ -23,7 +23,7 @@ class CastTransportIPC : public media::cast::CastTransport { |
public: |
CastTransportIPC(const net::IPEndPoint& local_end_point, |
const net::IPEndPoint& remote_end_point, |
- scoped_ptr<base::DictionaryValue> options, |
+ std::unique_ptr<base::DictionaryValue> options, |
const media::cast::PacketReceiverCallback& packet_callback, |
const media::cast::CastTransportStatusCallback& status_cb, |
const media::cast::BulkRawEventsCallback& raw_events_cb); |
@@ -33,14 +33,10 @@ class CastTransportIPC : public media::cast::CastTransport { |
// media::cast::CastTransport implementation. |
void InitializeAudio( |
const media::cast::CastTransportRtpConfig& config, |
- const media::cast::RtcpCastMessageCallback& cast_message_cb, |
- const media::cast::RtcpRttCallback& rtt_cb, |
- const media::cast::RtcpPliCallback& pli_cb) override; |
+ std::unique_ptr<media::cast::SenderRtcpObserver> rtcp_observer) override; |
void InitializeVideo( |
const media::cast::CastTransportRtpConfig& config, |
- const media::cast::RtcpCastMessageCallback& cast_message_cb, |
- const media::cast::RtcpRttCallback& rtt_cb, |
- const media::cast::RtcpPliCallback& pli_cb) override; |
+ std::unique_ptr<media::cast::SenderRtcpObserver> rtcp_observer) override; |
void InsertFrame(uint32_t ssrc, |
const media::cast::EncodedFrame& frame) override; |
void SendSenderReport( |
@@ -74,23 +70,14 @@ class CastTransportIPC : public media::cast::CastTransport { |
void OnReceivedPacket(const media::cast::Packet& packet); |
private: |
- struct ClientCallbacks { |
- ClientCallbacks(); |
- ClientCallbacks(const ClientCallbacks& other); |
- ~ClientCallbacks(); |
- |
- media::cast::RtcpCastMessageCallback cast_message_cb; |
- media::cast::RtcpRttCallback rtt_cb; |
- media::cast::RtcpPliCallback pli_cb; |
- }; |
- |
void Send(IPC::Message* message); |
int32_t channel_id_; |
media::cast::PacketReceiverCallback packet_callback_; |
media::cast::CastTransportStatusCallback status_callback_; |
media::cast::BulkRawEventsCallback raw_events_callback_; |
- typedef std::map<uint32_t, ClientCallbacks> ClientMap; |
+ using ClientMap = |
+ std::map<uint32_t, std::unique_ptr<media::cast::SenderRtcpObserver>>; |
ClientMap clients_; |
DISALLOW_COPY_AND_ASSIGN(CastTransportIPC); |