[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/test/utility/in_process_receiver.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_TEST_IN_PROCESS_RECEIVER_H_
 #define MEDIA_CAST_TEST_IN_PROCESS_RECEIVER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 28 matching lines @@
 // so that the implementor can focus on what is to be done with the frames,
 // rather than on the boilerplate "glue" code.
 class InProcessReceiver {
  public:
   // Construct a receiver with the given configuration.  |remote_end_point| can
   // be left empty, if the transport should automatically mate with the first
   // remote sender it encounters.
   InProcessReceiver(const scoped_refptr<CastEnvironment>& cast_environment,
                     const net::IPEndPoint& local_end_point,
                     const net::IPEndPoint& remote_end_point,
-                    const AudioReceiverConfig& audio_config,
-                    const VideoReceiverConfig& video_config);
+                    const FrameReceiverConfig& audio_config,
+                    const FrameReceiverConfig& video_config);
 
   virtual ~InProcessReceiver();
 
   // Convenience accessors.
   scoped_refptr<CastEnvironment> cast_env() const { return cast_environment_; }
-  const AudioReceiverConfig& audio_config() const { return audio_config_; }
-  const VideoReceiverConfig& video_config() const { return video_config_; }
+  const FrameReceiverConfig& audio_config() const { return audio_config_; }
+  const FrameReceiverConfig& video_config() const { return video_config_; }
 
   // Begin delivering any received audio/video frames to the OnXXXFrame()
   // methods.
   virtual void Start();
 
   // Destroy the sub-compontents of this class.
   // After this call, it is safe to destroy this object on any thread.
   virtual void Stop();
 
  protected:
@@ skipping 30 matching lines @@
                      bool is_continuous);
   void GotVideoFrame(const scoped_refptr<VideoFrame>& video_frame,
                      const base::TimeTicks& playout_time,
                      bool is_continuous);
   void PullNextAudioFrame();
   void PullNextVideoFrame();
 
   const scoped_refptr<CastEnvironment> cast_environment_;
   const net::IPEndPoint local_end_point_;
   const net::IPEndPoint remote_end_point_;
-  const AudioReceiverConfig audio_config_;
-  const VideoReceiverConfig video_config_;
+  const FrameReceiverConfig audio_config_;
+  const FrameReceiverConfig video_config_;
 
   scoped_ptr<transport::UdpTransport> transport_;
   scoped_ptr<CastReceiver> cast_receiver_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<InProcessReceiver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessReceiver);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_TEST_IN_PROCESS_RECEIVER_H_