Revert of Cast: Fix two video freezing problems

chrome/common/cast_messages.h

Index: chrome/common/cast_messages.h
diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h
index 4191adc1bf0e8e66599bfe866a4a484cd9836ba3..5b91f59a86f51019589c28d00f065d14ce802c30 100644
--- a/chrome/common/cast_messages.h
+++ b/chrome/common/cast_messages.h
@@ -63,27 +63,27 @@
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtpConfig)
-  IPC_STRUCT_TRAITS_MEMBER(ssrc)
+  IPC_STRUCT_TRAITS_MEMBER(history_ms)
   IPC_STRUCT_TRAITS_MEMBER(max_delay_ms)
   IPC_STRUCT_TRAITS_MEMBER(payload_type)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportBaseConfig)
+  IPC_STRUCT_TRAITS_MEMBER(ssrc)
+  IPC_STRUCT_TRAITS_MEMBER(rtp_config)
   IPC_STRUCT_TRAITS_MEMBER(aes_key)
   IPC_STRUCT_TRAITS_MEMBER(aes_iv_mask)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportRtpConfig)
-  IPC_STRUCT_TRAITS_MEMBER(config)
-  IPC_STRUCT_TRAITS_MEMBER(max_outstanding_frames)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportAudioConfig)
-  IPC_STRUCT_TRAITS_MEMBER(rtp)
+  IPC_STRUCT_TRAITS_MEMBER(base)
   IPC_STRUCT_TRAITS_MEMBER(codec)
   IPC_STRUCT_TRAITS_MEMBER(frequency)
   IPC_STRUCT_TRAITS_MEMBER(channels)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportVideoConfig)
-  IPC_STRUCT_TRAITS_MEMBER(rtp)
+  IPC_STRUCT_TRAITS_MEMBER(base)
   IPC_STRUCT_TRAITS_MEMBER(codec)
 IPC_STRUCT_TRAITS_END()