Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

chrome/renderer/media/cast_session_delegate.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 CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_
 #define CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 86 matching lines @@
                 const net::IPEndPoint& remote_endpoint,
                 std::unique_ptr<base::DictionaryValue> options,
                 const ErrorCallback& error_callback);
 
   // After calling StartAudio() or StartVideo() encoding of that media will
   // begin as soon as data is delivered to its sink, if the second method is
   // called the first media will be restarted. It is strongly recommended not to
   // deliver any data between calling the two methods.
   // It's OK to call only one of the two methods.
   // StartUDP must be called before these methods.
-  void StartAudio(const media::cast::FrameSenderConfig& config,
+  void StartAudio(const media::cast::AudioSenderConfig& config,
                   const AudioFrameInputAvailableCallback& callback,
                   const ErrorCallback& error_callback);
 
-  void StartVideo(
-      const media::cast::FrameSenderConfig& config,
-      const VideoFrameInputAvailableCallback& callback,
-      const ErrorCallback& error_callback,
-      const media::cast::CreateVideoEncodeAcceleratorCallback& create_vea_cb,
-      const media::cast::CreateVideoEncodeMemoryCallback&
-          create_video_encode_mem_cb);
+  void StartVideo(const media::cast::VideoSenderConfig& config,
+                  const VideoFrameInputAvailableCallback& callback,
+                  const ErrorCallback& error_callback,
+                  const media::cast::CreateVideoEncodeAcceleratorCallback&
+                      create_vea_cb,
+                  const media::cast::CreateVideoEncodeMemoryCallback&
+                      create_video_encode_mem_cb);
 
   void ToggleLogging(bool is_audio, bool enable);
   void GetEventLogsAndReset(bool is_audio,
       const std::string& extra_data, const EventLogsCallback& callback);
   void GetStatsAndReset(bool is_audio, const StatsCallback& callback);
 
  protected:
   // Called to report back operational status changes.  The first time this is
   // called with STATUS_INITIALIZED will result in running the "frame input
   // available" callback, to indicate the session is ready to accept incoming
@@ skipping 15 matching lines @@
   VideoFrameInputAvailableCallback video_frame_input_available_callback_;
 
   std::unique_ptr<media::cast::RawEventSubscriberBundle> event_subscribers_;
 
   base::WeakPtrFactory<CastSessionDelegate> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CastSessionDelegate);
 };
 
 #endif  // CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_