cast: cleanup rtp header and parsing

media/cast/net/rtp/rtp_packet_builder.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // 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 {
 
 // TODO(miu): Consolidate with RtpPacketizer as a single Cast packet
 // serialization implementation.
 class RtpPacketBuilder {
  public:
   RtpPacketBuilder();
   void SetKeyFrame(bool is_key);
@@ skipping 21 matching lines @@
 
   void BuildCastHeader(uint8* data, uint32 data_length);
   void BuildCommonHeader(uint8* data, uint32 data_length);
 
   DISALLOW_COPY_AND_ASSIGN(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_