Revert 226264 "Be able to build cast_unittest and related target..."

trunk/src/media/cast/cast_sender_impl.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/cast_sender_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 
@@ skipping 37 matching lines @@
   }
 
   virtual void InsertCodedAudioFrame(const EncodedAudioFrame* audio_frame,
                                      const base::TimeTicks& recorded_time,
                                      const base::Closure callback) OVERRIDE {
     cast_thread_->PostTask(CastThread::MAIN, FROM_HERE,
         base::Bind(&AudioSender::InsertCodedAudioFrame, audio_sender_,
             audio_frame, recorded_time, callback));
   }
 
- protected:
-  virtual ~LocalFrameInput() {}
-
  private:
-  friend class base::RefCountedThreadSafe<LocalFrameInput>;
-
   scoped_refptr<CastThread> cast_thread_;
   base::WeakPtr<AudioSender> audio_sender_;
   base::WeakPtr<VideoSender> video_sender_;
 };
 
 // LocalCastSenderPacketReceiver handle the incoming packets to the cast sender
 // it's only expected to receive RTCP feedback packets from the remote cast
 // receiver. The class verifies that that it is a RTCP packet and based on the
 // SSRC of the incoming packet route the packet to the correct sender; audio or
 // video.
@@ skipping 24 matching lines @@
                                 base::WeakPtr<AudioSender> audio_sender,
                                 base::WeakPtr<VideoSender> video_sender,
                                 uint32 ssrc_of_audio_sender,
                                 uint32 ssrc_of_video_sender)
      : cast_thread_(cast_thread),
        audio_sender_(audio_sender),
        video_sender_(video_sender),
        ssrc_of_audio_sender_(ssrc_of_audio_sender),
        ssrc_of_video_sender_(ssrc_of_video_sender) {}
 
+  virtual ~LocalCastSenderPacketReceiver() {}
+
   virtual void ReceivedPacket(const uint8* packet,
                               int length,
                               const base::Closure callback) OVERRIDE {
     if (!Rtcp::IsRtcpPacket(packet, length)) {
       // We should have no incoming RTP packets.
       // No action; just log and call the callback informing that we are done
       // with the packet.
       VLOG(1) << "Unexpectedly received a RTP packet in the cast sender";
       cast_thread_->PostTask(CastThread::MAIN, FROM_HERE, callback);
       return;
@@ skipping 10 matching lines @@
     } else {
       // No action; just log and call the callback informing that we are done
       // with the packet.
       VLOG(1) << "Received a RTCP packet with a non matching sender SSRC "
               << ssrc_of_sender;
 
       cast_thread_->PostTask(CastThread::MAIN, FROM_HERE, callback);
     }
   }
 
- protected:
-  virtual ~LocalCastSenderPacketReceiver() {}
-
  private:
-  friend class base::RefCountedThreadSafe<LocalCastSenderPacketReceiver>;
-
   scoped_refptr<CastThread> cast_thread_;
   base::WeakPtr<AudioSender> audio_sender_;
   base::WeakPtr<VideoSender> video_sender_;
   uint32 ssrc_of_audio_sender_;
   uint32 ssrc_of_video_sender_;
 };
 
 CastSender* CastSender::CreateCastSender(
     scoped_refptr<CastThread> cast_thread,
     const AudioSenderConfig& audio_config,
@@ skipping 19 matching lines @@
                     &pacer_),
       frame_input_(new LocalFrameInput(cast_thread, audio_sender_.AsWeakPtr(),
                                        video_sender_.AsWeakPtr())),
       packet_receiver_(new LocalCastSenderPacketReceiver(cast_thread,
           audio_sender_.AsWeakPtr(), video_sender_.AsWeakPtr(),
           audio_config.incoming_feedback_ssrc,
           video_config.incoming_feedback_ssrc)) {}
 
 CastSenderImpl::~CastSenderImpl() {}
 
-scoped_refptr<FrameInput> CastSenderImpl::frame_input() {
-  return frame_input_;
-}
-
-scoped_refptr<PacketReceiver> CastSenderImpl::packet_receiver() {
-  return packet_receiver_;
-}
-
 }  // namespace cast
 }  // namespace media