commit ff483617a4fdf282bb82d7f4ce15af3dbe305a4a
author stefan <stefan@webrtc.org> Mon Dec 21 11:14:00 2015
committer Commit bot <commit-bot@chromium.org> Mon Dec 21 11:14:05 2015
tree fdc1723ffef560da14cea84bf29ad105195abf3e
parent cce46fc108a70336f0477fd58d41f38e547eeb25

Step 1 to prepare call_test.* for combined audio/video tests.

Also move (and clean up includes) rampup_tests.* to webrtc/call in preparation for combined audio/video ramp-up tests.

No functional changes.

BUG=webrtc:5263

Review URL: https://codereview.webrtc.org/1537273003

Cr-Commit-Position: refs/heads/master@{#11101}

webrtc/test/call_test.h

diff --git a/webrtc/test/call_test.h b/webrtc/test/call_test.h
index 7828986..32820ed 100644
--- a/webrtc/test/call_test.h
+++ b/webrtc/test/call_test.h
@@ -67,14 +67,14 @@
 
   rtc::scoped_ptr<Call> sender_call_;
   rtc::scoped_ptr<PacketTransport> send_transport_;
-  VideoSendStream::Config send_config_;
-  VideoEncoderConfig encoder_config_;
-  VideoSendStream* send_stream_;
+  VideoSendStream::Config video_send_config_;
+  VideoEncoderConfig video_encoder_config_;
+  VideoSendStream* video_send_stream_;
 
   rtc::scoped_ptr<Call> receiver_call_;
   rtc::scoped_ptr<PacketTransport> receive_transport_;
-  std::vector<VideoReceiveStream::Config> receive_configs_;
-  std::vector<VideoReceiveStream*> receive_streams_;
+  std::vector<VideoReceiveStream::Config> video_receive_configs_;
+  std::vector<VideoReceiveStream*> video_receive_streams_;
 
   rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_;
   test::FakeEncoder fake_encoder_;
@@ -97,11 +97,11 @@
   virtual void OnTransportsCreated(PacketTransport* send_transport,
                                    PacketTransport* receive_transport);
 
-  virtual void ModifyConfigs(
+  virtual void ModifyVideoConfigs(
       VideoSendStream::Config* send_config,
       std::vector<VideoReceiveStream::Config>* receive_configs,
       VideoEncoderConfig* encoder_config);
-  virtual void OnStreamsCreated(
+  virtual void OnVideoStreamsCreated(
       VideoSendStream* send_stream,
       const std::vector<VideoReceiveStream*>& receive_streams);