Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

trunk/src/media/cast/framer/frame_buffer.cc

 // Copyright 2013 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.
 
 #include "media/cast/framer/frame_buffer.h"
 
 #include "base/logging.h"
 
 namespace media {
 namespace cast {
@@ skipping 43 matching lines @@
             retval.first->second.begin());
 
   ++num_packets_received_;
   total_data_size_ += payload_size;
 }
 
 bool FrameBuffer::Complete() const {
   return num_packets_received_ - 1 == max_packet_id_;
 }
 
-bool FrameBuffer::GetEncodedAudioFrame(
-    transport::EncodedAudioFrame* audio_frame,
-    uint32* rtp_timestamp) const {
+bool FrameBuffer::GetEncodedAudioFrame(EncodedAudioFrame* audio_frame,
+                                       uint32* rtp_timestamp) const {
   if (!Complete()) return false;
 
   *rtp_timestamp = rtp_timestamp_;
 
   // Frame is complete -> construct.
   audio_frame->frame_id = frame_id_;
 
   // Build the data vector.
   audio_frame->data.clear();
   audio_frame->data.reserve(total_data_size_);
   PacketMap::const_iterator it;
   for (it = packets_.begin(); it != packets_.end(); ++it) {
     audio_frame->data.insert(audio_frame->data.end(),
                              it->second.begin(), it->second.end());
   }
   return true;
 }
 
-bool FrameBuffer::GetEncodedVideoFrame(
-    transport::EncodedVideoFrame* video_frame,
-    uint32* rtp_timestamp) const {
+bool FrameBuffer::GetEncodedVideoFrame(EncodedVideoFrame* video_frame,
+                                       uint32* rtp_timestamp) const {
   if (!Complete()) return false;
 
   *rtp_timestamp = rtp_timestamp_;
 
   // Frame is complete -> construct.
   video_frame->key_frame = is_key_frame_;
   video_frame->frame_id = frame_id_;
   video_frame->last_referenced_frame_id = last_referenced_frame_id_;
 
   // Build the data vector.
   video_frame->data.clear();
   video_frame->data.reserve(total_data_size_);
   PacketMap::const_iterator it;
   for (it = packets_.begin(); it != packets_.end(); ++it) {
     video_frame->data.insert(video_frame->data.end(),
                              it->second.begin(), it->second.end());
   }
   return true;
 }
 
 }  // namespace cast
 }  // namespace media