Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/h264_vt_encoder.h

 // Copyright 2014 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_SENDER_H264_VT_ENCODER_H_
 #define MEDIA_CAST_SENDER_H264_VT_ENCODER_H_
 
 #include <stdint.h>
 
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 15 matching lines @@
 // compression session when the host process is suspended.
 class H264VideoToolboxEncoder : public VideoEncoder,
                                 public base::PowerObserver {
   typedef CoreMediaGlue::CMSampleBufferRef CMSampleBufferRef;
   typedef VideoToolboxGlue::VTCompressionSessionRef VTCompressionSessionRef;
   typedef VideoToolboxGlue::VTEncodeInfoFlags VTEncodeInfoFlags;
 
  public:
   // Returns true if the current platform and system configuration supports
   // using H264VideoToolboxEncoder with the given |video_config|.
-  static bool IsSupported(const FrameSenderConfig& video_config);
+  static bool IsSupported(const VideoSenderConfig& video_config);
 
   H264VideoToolboxEncoder(
       const scoped_refptr<CastEnvironment>& cast_environment,
-      const FrameSenderConfig& video_config,
+      const VideoSenderConfig& video_config,
       const StatusChangeCallback& status_change_cb);
   ~H264VideoToolboxEncoder() final;
 
   // media::cast::VideoEncoder implementation
   bool EncodeVideoFrame(
       const scoped_refptr<media::VideoFrame>& video_frame,
       const base::TimeTicks& reference_time,
       const FrameEncodedCallback& frame_encoded_callback) final;
   void SetBitRate(int new_bit_rate) final;
   void GenerateKeyFrame() final;
@@ skipping 34 matching lines @@
 
   // The cast environment (contains worker threads & more).
   const scoped_refptr<CastEnvironment> cast_environment_;
 
   // VideoToolboxGlue provides access to VideoToolbox at runtime.
   const VideoToolboxGlue* const videotoolbox_glue_;
 
   // VideoSenderConfig copy so we can create compression sessions on demand.
   // This is needed to recover from backgrounding and other events that can
   // invalidate compression sessions.
-  const FrameSenderConfig video_config_;
+  const VideoSenderConfig video_config_;
 
   // Frame size of the current compression session. Can be changed by submitting
   // a frame of a different size, which will cause a compression session reset.
   gfx::Size frame_size_;
 
   // Callback used to report initialization status and runtime errors.
   const StatusChangeCallback status_change_cb_;
 
   // Thread checker to enforce that this object is used on a specific thread.
   base::ThreadChecker thread_checker_;
@@ skipping 16 matching lines @@
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<H264VideoToolboxEncoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(H264VideoToolboxEncoder);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_H264_VT_ENCODER_H_