Revert of Cast: Fix two video freezing problems

media/cast/transport/cast_transport_config.h

Index: media/cast/transport/cast_transport_config.h
diff --git a/media/cast/transport/cast_transport_config.h b/media/cast/transport/cast_transport_config.h
index d72d1f8e32e26328835253adf56b19efb8c8c9b2..cddd6d11e8563ef677728496112c6045c7da5e2e 100644
--- a/media/cast/transport/cast_transport_config.h
+++ b/media/cast/transport/cast_transport_config.h
@@ -36,26 +36,27 @@
 
 struct RtpConfig {
   RtpConfig();
-  ~RtpConfig();
-  uint32 ssrc;
+  int history_ms;  // The time RTP packets are stored for retransmissions.
   int max_delay_ms;
   int payload_type;
+};
+
+// TODO(mikhal): Consider combining this with the cast_sender config.
+struct CastTransportBaseConfig {
+  CastTransportBaseConfig();
+  ~CastTransportBaseConfig();
+
+  uint32 ssrc;
+  RtpConfig rtp_config;
   std::string aes_key;      // Binary string of size kAesKeySize.
   std::string aes_iv_mask;  // Binary string of size kAesBlockSize.
-};
-
-struct CastTransportRtpConfig {
-  CastTransportRtpConfig();
-  ~CastTransportRtpConfig();
-  RtpConfig config;
-  int max_outstanding_frames;
 };
 
 struct CastTransportAudioConfig {
   CastTransportAudioConfig();
   ~CastTransportAudioConfig();
 
-  CastTransportRtpConfig rtp;
+  CastTransportBaseConfig base;
   AudioCodec codec;
   int frequency;
   int channels;
@@ -65,7 +66,7 @@
   CastTransportVideoConfig();
   ~CastTransportVideoConfig();
 
-  CastTransportRtpConfig rtp;
+  CastTransportBaseConfig base;
   VideoCodec codec;
 };