RELAND: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/sender.cc

 // 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.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 206 matching lines @@
   if (remote_ip_address.empty())
     remote_ip_address = "127.0.0.1";
   int remote_port = 0;
   if (!base::StringToInt(cmd->GetSwitchValueASCII(kSwitchPort), &remote_port) ||
       remote_port < 0 || remote_port > 65535) {
     remote_port = 2344;
   }
   LOG(INFO) << "Sending to " << remote_ip_address << ":" << remote_port
             << ".";
 
-  media::cast::AudioSenderConfig audio_config =
+  media::cast::FrameSenderConfig audio_config =
       media::cast::GetDefaultAudioSenderConfig();
-  media::cast::VideoSenderConfig video_config =
+  media::cast::FrameSenderConfig video_config =
       media::cast::GetDefaultVideoSenderConfig();
 
   // Running transport on the main thread.
   // Setting up transport config.
   net::IPEndPoint remote_endpoint =
       CreateUDPAddress(remote_ip_address, static_cast<uint16_t>(remote_port));
 
   // Enable raw event and stats logging.
   // Running transport on the main thread.
   scoped_refptr<media::cast::CastEnvironment> cast_environment(
@@ skipping 108 matching lines @@
       FROM_HERE, base::Bind(&media::cast::CastSender::InitializeAudio,
                             base::Unretained(cast_sender.get()), audio_config,
                             base::Bind(&QuitLoopOnInitializationResult)));
   io_message_loop.Run();  // Wait for audio initialization.
 
   fake_media_source->Start(cast_sender->audio_frame_input(),
                            cast_sender->video_frame_input());
   io_message_loop.Run();
   return 0;
 }