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

trunk/src/media/cast/audio_sender/audio_encoder.h

Index: trunk/src/media/cast/audio_sender/audio_encoder.h
===================================================================
--- trunk/src/media/cast/audio_sender/audio_encoder.h	(revision 226266)
+++ trunk/src/media/cast/audio_sender/audio_encoder.h	(working copy)
@@ -30,6 +30,8 @@
   AudioEncoder(scoped_refptr<CastThread> cast_thread,
                const AudioSenderConfig& audio_config);
 
+  virtual ~AudioEncoder();
+
   // The audio_frame must be valid until the closure callback is called.
   // The closure callback is called from the main cast thread as soon as
   // the encoder is done with the frame; it does not mean that the encoded frame
@@ -39,12 +41,7 @@
                            const FrameEncodedCallback& frame_encoded_callback,
                            const base::Closure callback);
 
- protected:
-  virtual ~AudioEncoder();
-
  private:
-  friend class base::RefCountedThreadSafe<AudioEncoder>;
-
   void EncodeAudioFrameThread(
       const PcmAudioFrame* audio_frame,
       const base::TimeTicks& recorded_time,
@@ -52,7 +49,8 @@
       const base::Closure release_callback);
 
   scoped_refptr<CastThread> cast_thread_;
-  scoped_ptr<webrtc::AudioCodingModule> audio_encoder_;
+  // Can't use scoped_ptr due to protected constructor within webrtc.
+  webrtc::AudioCodingModule* audio_encoder_;
   scoped_ptr<WebrtEncodedDataCallback> webrtc_encoder_callback_;
   uint32 timestamp_;