| Index: services/media/framework_mojo/mojo_consumer.h
|
| diff --git a/services/media/framework_mojo/mojo_consumer.h b/services/media/framework_mojo/mojo_consumer.h
|
| index c464373265813438bddee3761e6b4d880671e1fb..44ffc8eb079aced1a6be91972b913114d2b25250 100644
|
| --- a/services/media/framework_mojo/mojo_consumer.h
|
| +++ b/services/media/framework_mojo/mojo_consumer.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_CONSUMER_H_
|
| #define SERVICES_MEDIA_FRAMEWORK_MOJO_MOJO_CONSUMER_H_
|
|
|
| -
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/task_runner.h"
|
| #include "mojo/common/binding_set.h"
|
| @@ -50,12 +49,11 @@ class MojoConsumer : public MojoConsumerMediaConsumer, public ActiveSource {
|
| void SetFlushRequestedCallback(const FlushRequestedCallback& callback);
|
|
|
| // MediaConsumer implementation.
|
| - void SetBuffer(
|
| - ScopedSharedBufferHandle buffer,
|
| - const SetBufferCallback& callback) override;
|
| + void SetBuffer(ScopedSharedBufferHandle buffer,
|
| + const SetBufferCallback& callback) override;
|
|
|
| - void SendPacket(MediaPacketPtr packet, const SendPacketCallback& callback)
|
| - override;
|
| + void SendPacket(MediaPacketPtr packet,
|
| + const SendPacketCallback& callback) override;
|
|
|
| void Prime(const PrimeCallback& callback) override;
|
|
|
| @@ -81,22 +79,18 @@ class MojoConsumer : public MojoConsumerMediaConsumer, public ActiveSource {
|
| const SendPacketCallback& callback,
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| const MappedSharedBuffer& buffer) {
|
| - return PacketPtr(new PacketImpl(
|
| - media_packet.Pass(),
|
| - callback,
|
| - task_runner,
|
| - buffer));
|
| + return PacketPtr(
|
| + new PacketImpl(media_packet.Pass(), callback, task_runner, buffer));
|
| }
|
|
|
| protected:
|
| void Release() override;
|
|
|
| private:
|
| - PacketImpl(
|
| - MediaPacketPtr media_packet,
|
| - const SendPacketCallback& callback,
|
| - scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| - const MappedSharedBuffer& buffer);
|
| + PacketImpl(MediaPacketPtr media_packet,
|
| + const SendPacketCallback& callback,
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| + const MappedSharedBuffer& buffer);
|
|
|
| ~PacketImpl() override;
|
|
|
|
|