Reland of Don't hardcode MediaType::ANY in FakeNetworkPipe.

webrtc/test/fake_network_pipe.h

Index: webrtc/test/fake_network_pipe.h
diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h
index 0c73e85e1edfa829d7dfa25524479a024de107c8..adf76c3a7bae731b05b6498aa792c747d0d96797 100644
--- a/webrtc/test/fake_network_pipe.h
+++ b/webrtc/test/fake_network_pipe.h
@@ -25,6 +25,7 @@ namespace webrtc {
 
 class Clock;
 class PacketReceiver;
+enum class MediaType;
 
 class NetworkPacket {
  public:
@@ -82,9 +83,10 @@ class FakeNetworkPipe {
     int avg_burst_loss_length = -1;
   };
 
-  FakeNetworkPipe(Clock* clock, const FakeNetworkPipe::Config& config);
+  FakeNetworkPipe(Clock* clock, const FakeNetworkPipe::Config& config,
+                  MediaType media_type);

[perkj_webrtc, 2017/03/30 09:13:24]

This will not work for tests that mux audio and video on the same transport. The
fake network pipe then needs to know per packet what type it is. 

[nisse-webrtc, 2017/03/30 09:22:35]

For webrtc tests, I fixed that case by adding a payload-type demuxer, see this
cl's changes to call_test.cc.

Letting the network pipe keep track of media type per packet would make sense to
me, but I haven't looked into how to make that work. We'd then need media type
config at all places where packets are inserted into the pipe.

   FakeNetworkPipe(Clock* clock,
-                  const FakeNetworkPipe::Config& config,
+                  const FakeNetworkPipe::Config& config, MediaType media_type,
                   uint64_t seed);
   ~FakeNetworkPipe();
 
@@ -110,6 +112,7 @@ class FakeNetworkPipe {
 
  private:
   Clock* const clock_;
+  const MediaType media_type_;
   rtc::CriticalSection lock_;
   PacketReceiver* packet_receiver_;
   std::queue<NetworkPacket*> capacity_link_;