Revert 243647 "Cast:Adding cast_transport_config and cleaning up"

trunk/src/media/cast/cast_receiver.h

 // 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.
 //
 // This is the main interface for the cast receiver. All configuration are done
 // at creation.
 
 #ifndef MEDIA_CAST_CAST_RECEIVER_H_
 #define MEDIA_CAST_CAST_RECEIVER_H_
 
@@ skipping 10 matching lines @@
 }
 
 namespace media {
 namespace cast {
 // Callback in which the raw audio frame and play-out time will be returned
 // once decoding is complete.
 typedef base::Callback<void(scoped_ptr<PcmAudioFrame>, const base::TimeTicks&)>
     AudioFrameDecodedCallback;
 
 // Callback in which the encoded audio frame and play-out time will be returned.
-typedef base::Callback<void(scoped_ptr<transport::EncodedAudioFrame>,
+typedef base::Callback<void(scoped_ptr<EncodedAudioFrame>,
     const base::TimeTicks&)> AudioFrameEncodedCallback;
 
 // Callback in which the raw frame and render time will be returned once
 // decoding is complete.
 typedef base::Callback<void(const scoped_refptr<media::VideoFrame>& video_frame,
                             const base::TimeTicks&)>
     VideoFrameDecodedCallback;
 
 // Callback in which the encoded video frame and render time will be returned.
-typedef base::Callback<void(scoped_ptr<transport::EncodedVideoFrame>,
+typedef base::Callback<void(scoped_ptr<EncodedVideoFrame>,
     const base::TimeTicks&)> VideoFrameEncodedCallback;
 
 // This Class is thread safe.
 class FrameReceiver : public base::RefCountedThreadSafe<FrameReceiver> {
  public:
   virtual void GetRawAudioFrame(int number_of_10ms_blocks,
                                 int desired_frequency,
                                 const AudioFrameDecodedCallback& callback) = 0;
 
   virtual void GetCodedAudioFrame(
@@ skipping 15 matching lines @@
 class CastReceiver {
  public:
   static CastReceiver* CreateCastReceiver(
       scoped_refptr<CastEnvironment> cast_environment,
       const AudioReceiverConfig& audio_config,
       const VideoReceiverConfig& video_config,
       PacketSender* const packet_sender);
 
   // All received RTP and RTCP packets for the call should be inserted to this
   // PacketReceiver.
-  virtual scoped_refptr<transport::PacketReceiver> packet_receiver() = 0;
+  virtual scoped_refptr<PacketReceiver> packet_receiver() = 0;
 
   // Polling interface to get audio and video frames from the CastReceiver.
   virtual scoped_refptr<FrameReceiver> frame_receiver() = 0;
 
   virtual ~CastReceiver() {}
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_CAST_RECEIVER_H_