cast: cleanup rtp header and parsing

media/cast/net/rtp/rtp_packet_builder.h

Index: media/cast/net/rtp/rtp_packet_builder.h
diff --git a/media/cast/net/rtp/rtp_packet_builder.h b/media/cast/net/rtp/rtp_packet_builder.h
index 3d6579720bd6c7ff68fe99621d5bb0cc3ad7b7ae..da8efc9bd1b2f6eeb8eab44f25eeb5a242ef02b2 100644
--- a/media/cast/net/rtp/rtp_packet_builder.h
+++ b/media/cast/net/rtp/rtp_packet_builder.h
@@ -4,10 +4,10 @@
 
 // Test helper class that builds rtp packets.
 
-#ifndef MEDIA_CAST_RTP_RECEIVER_RTP_PARSER_TEST_RTP_PACKET_BUILDER_H_
-#define MEDIA_CAST_RTP_RECEIVER_RTP_PARSER_TEST_RTP_PACKET_BUILDER_H_
+#ifndef MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_
+#define MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_
 
-#include "media/cast/net/rtp/rtp_receiver_defines.h"
+#include "media/cast/net/rtp/rtp_defines.h"
 
 namespace media {
 namespace cast {
@@ -49,4 +49,4 @@ class RtpPacketBuilder {
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_RTP_RECEIVER_RTP_PARSER_TEST_RTP_PACKET_BUILDER_H_
+#endif  // MEDIA_CAST_NET_RTP_RTP_PACKET_BUILDER_H_