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

trunk/src/media/cast/video_sender/video_encoder.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.
 
 #ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_
 #define MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_thread.h"
 #include "media/cast/video_sender/codecs/vp8/vp8_encoder.h"
 
 namespace media {
 namespace cast {
 
 // This object is called external from the main cast thread and internally from
 // the video encoder thread.
 class VideoEncoder : public VideoEncoderController,
                      public base::RefCountedThreadSafe<VideoEncoder> {
  public:
   typedef base::Callback<void(scoped_ptr<EncodedVideoFrame>,
                               const base::TimeTicks&)> FrameEncodedCallback;
 
   VideoEncoder(scoped_refptr<CastThread> cast_thread,
                const VideoSenderConfig& video_config,
                uint8 max_unacked_frames);
 
+  virtual ~VideoEncoder();
+
   // Called from the main cast thread. This function post the encode task to the
   // video encoder thread;
   // The video_frame must be valid until the closure callback is called.
   // The closure callback is called from the video encoder thread as soon as
   // the encoder is done with the frame; it does not mean that the encoded frame
   // has been sent out.
   // Once the encoded frame is ready the frame_encoded_callback is called.
   bool EncodeVideoFrame(const I420VideoFrame* video_frame,
                         const base::TimeTicks& capture_time,
                         const FrameEncodedCallback& frame_encoded_callback,
                         const base::Closure frame_release_callback);
 
  protected:
-  virtual ~VideoEncoder();
-
   struct CodecDynamicConfig {
     bool key_frame_requested;
     uint8 latest_frame_id_to_reference;
     int bit_rate;
   };
 
   // The actual encode, called from the video encoder thread.
   void EncodeVideoFrameEncoderThread(
       const I420VideoFrame* video_frame,
       const base::TimeTicks& capture_time,
       const CodecDynamicConfig& dynamic_config,
       const FrameEncodedCallback& frame_encoded_callback,
       const base::Closure frame_release_callback);
 
   // The following functions are called from the main cast thread.
   virtual void SetBitRate(int new_bit_rate) OVERRIDE;
   virtual void SkipNextFrame(bool skip_next_frame) OVERRIDE;
   virtual void GenerateKeyFrame() OVERRIDE;
   virtual void LatestFrameIdToReference(uint8 frame_id) OVERRIDE;
   virtual int NumberOfSkippedFrames() const OVERRIDE;
 
  private:
-  friend class base::RefCountedThreadSafe<VideoEncoder>;
-
   const VideoSenderConfig video_config_;
   scoped_refptr<CastThread> cast_thread_;
   scoped_ptr<Vp8Encoder> vp8_encoder_;
   CodecDynamicConfig dynamic_config_;
   bool skip_next_frame_;
   int skip_count_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoEncoder);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_H_