| Index: webrtc/test/direct_transport.h
 | 
| diff --git a/webrtc/test/direct_transport.h b/webrtc/test/direct_transport.h
 | 
| index eee94bec1b93d791efa8c4ddfcdc624c8e220d61..915f8cffc12d00d5267203ddf31edb150c5946c6 100644
 | 
| --- a/webrtc/test/direct_transport.h
 | 
| +++ b/webrtc/test/direct_transport.h
 | 
| @@ -19,6 +19,7 @@
 | 
|  #include "webrtc/rtc_base/sequenced_task_checker.h"
 | 
|  #include "webrtc/rtc_base/thread_annotations.h"
 | 
|  #include "webrtc/test/fake_network_pipe.h"
 | 
| +#include "webrtc/test/rtp_file_writer.h"
 | 
|  #include "webrtc/test/single_threaded_task_queue.h"
 | 
|  
 | 
|  namespace webrtc {
 | 
| @@ -28,9 +29,9 @@ class PacketReceiver;
 | 
|  
 | 
|  namespace test {
 | 
|  
 | 
| -// Objects of this class are expected to be allocated and destroyed  on the
 | 
| +// Objects of this class are expected to be allocated and destroyed on the
 | 
|  // same task-queue - the one that's passed in via the constructor.
 | 
| -class DirectTransport : public Transport {
 | 
| +class DirectTransport : public Transport, private PacketReceiver {
 | 
|   public:
 | 
|    DirectTransport(SingleThreadedTaskQueueForTesting* task_queue,
 | 
|                    Call* send_call,
 | 
| @@ -39,12 +40,14 @@ class DirectTransport : public Transport {
 | 
|    DirectTransport(SingleThreadedTaskQueueForTesting* task_queue,
 | 
|                    const FakeNetworkPipe::Config& config,
 | 
|                    Call* send_call,
 | 
| -                  const std::map<uint8_t, MediaType>& payload_type_map);
 | 
| +                  const std::map<uint8_t, MediaType>& payload_type_map,
 | 
| +                  std::unique_ptr<test::RtpFileWriter> rtp_file_writer);
 | 
|  
 | 
|    DirectTransport(SingleThreadedTaskQueueForTesting* task_queue,
 | 
|                    const FakeNetworkPipe::Config& config,
 | 
|                    Call* send_call,
 | 
| -                  std::unique_ptr<Demuxer> demuxer);
 | 
| +                  std::unique_ptr<Demuxer> demuxer,
 | 
| +                  std::unique_ptr<test::RtpFileWriter> rtp_file_writer);
 | 
|  
 | 
|    ~DirectTransport() override;
 | 
|  
 | 
| @@ -63,6 +66,11 @@ class DirectTransport : public Transport {
 | 
|    int GetAverageDelayMs();
 | 
|  
 | 
|   private:
 | 
| +  DeliveryStatus DeliverPacket(MediaType media_type,
 | 
| +                               const uint8_t* packet,
 | 
| +                               size_t length,
 | 
| +                               const PacketTime& packet_time) override;
 | 
| +
 | 
|    void SendPackets();
 | 
|  
 | 
|    Call* const send_call_;
 | 
| @@ -77,6 +85,10 @@ class DirectTransport : public Transport {
 | 
|    FakeNetworkPipe fake_network_;
 | 
|  
 | 
|    rtc::SequencedTaskChecker sequence_checker_;
 | 
| +
 | 
| +  PacketReceiver* receiver_;
 | 
| +  const int64_t start_ms_;
 | 
| +  std::unique_ptr<test::RtpFileWriter> rtp_file_writer_;
 | 
|  };
 | 
|  }  // namespace test
 | 
|  }  // namespace webrtc
 | 
| 
 |