| Index: media/cast/net/cast_transport.h
|
| diff --git a/media/cast/net/cast_transport.h b/media/cast/net/cast_transport.h
|
| index 953d61cdd4529575ea9260ab7e2b2dd221b91fd9..1324e20d28a13bef539210e0dcdf2f626df6cc3f 100644
|
| --- a/media/cast/net/cast_transport.h
|
| +++ b/media/cast/net/cast_transport.h
|
| @@ -20,8 +20,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/callback.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/time/tick_clock.h"
|
| @@ -52,8 +53,8 @@ struct RtcpTimeData;
|
| typedef base::Callback<void(CastTransportStatus status)>
|
| CastTransportStatusCallback;
|
|
|
| -typedef base::Callback<void(scoped_ptr<std::vector<FrameEvent>>,
|
| - scoped_ptr<std::vector<PacketEvent>>)>
|
| +typedef base::Callback<void(std::unique_ptr<std::vector<FrameEvent>>,
|
| + std::unique_ptr<std::vector<PacketEvent>>)>
|
| BulkRawEventsCallback;
|
|
|
| // The application should only trigger this class from the transport thread.
|
| @@ -72,18 +73,18 @@ class CastTransport : public base::NonThreadSafe {
|
| // the configured logging flush interval passed to
|
| // CastTransport::Create().
|
| virtual void OnLoggingEventsReceived(
|
| - scoped_ptr<std::vector<FrameEvent>> frame_events,
|
| - scoped_ptr<std::vector<PacketEvent>> packet_events) = 0;
|
| + std::unique_ptr<std::vector<FrameEvent>> frame_events,
|
| + std::unique_ptr<std::vector<PacketEvent>> packet_events) = 0;
|
|
|
| // Called to pass RTP packets to the Client.
|
| - virtual void ProcessRtpPacket(scoped_ptr<Packet> packet) = 0;
|
| + virtual void ProcessRtpPacket(std::unique_ptr<Packet> packet) = 0;
|
| };
|
|
|
| - static scoped_ptr<CastTransport> Create(
|
| + static std::unique_ptr<CastTransport> Create(
|
| base::TickClock* clock, // Owned by the caller.
|
| base::TimeDelta logging_flush_interval,
|
| - scoped_ptr<Client> client,
|
| - scoped_ptr<PacketTransport> transport,
|
| + std::unique_ptr<Client> client,
|
| + std::unique_ptr<PacketTransport> transport,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner);
|
|
|
| virtual ~CastTransport() {}
|
|
|