cast: cleanup rtp header and parsing

media/cast/net/rtp/cast_message_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.
 
 // Handles NACK list and manages ACK.
 
-#ifndef MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
-#define MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
+#ifndef MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_
+#define MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_
 
 #include <deque>
 #include <map>
 
 #include "media/cast/net/rtcp/rtcp.h"
-#include "media/cast/net/rtp/rtp_receiver_defines.h"
+#include "media/cast/net/rtp/rtp_defines.h"
 
 namespace media {
 namespace cast {
 
 class Framer;
 class RtpPayloadFeedback;
 
 typedef std::map<uint32, base::TimeTicks> TimeLastNackMap;
 
 class CastMessageBuilder {
@@ skipping 34 matching lines @@
   bool acked_last_frame_;
   uint32 last_acked_frame_id_;
   std::deque<uint32> ack_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(CastMessageBuilder);
 };
 
 }  // namespace cast
 }  // namespace media
 
-#endif  //  MEDIA_CAST_FRAMER_CAST_MESSAGE_BUILDER_H_
+#endif  //  MEDIA_CAST_NET_RTP_CAST_MESSAGE_BUILDER_H_