Refactoring: CastTransport InitializeAudio/InitializeVideo.

media/cast/test/cast_benchmarks.cc

Index: media/cast/test/cast_benchmarks.cc
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index 4bebe4a02d460cb712a505efa26ed5aa3a52dca1..08fc8eae70cdebca2246df8ff7730ec3ae99c67f 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -97,16 +97,10 @@ class CastTransportWrapper : public CastTransport {
     encoded_audio_bytes_ = encoded_audio_bytes;
   }
 
-  void InitializeAudio(const CastTransportRtpConfig& config,
-                       std::unique_ptr<RtcpObserver> rtcp_observer) final {
+  void InitializeStream(const CastTransportRtpConfig& config,
+                        std::unique_ptr<RtcpObserver> rtcp_observer) final {
     audio_ssrc_ = config.ssrc;

[miu, 2016/07/06 21:45:42]

Need to set video_ssrc_ instead, if this is video.

[xjz, 2016/07/13 20:31:17]

Done.

-    transport_->InitializeAudio(config, std::move(rtcp_observer));
-  }
-
-  void InitializeVideo(const CastTransportRtpConfig& config,
-                       std::unique_ptr<RtcpObserver> rtcp_observer) final {
-    video_ssrc_ = config.ssrc;
-    transport_->InitializeVideo(config, std::move(rtcp_observer));
+    transport_->InitializeStream(config, std::move(rtcp_observer));
   }
 
   void InsertFrame(uint32_t ssrc, const EncodedFrame& frame) final {
@@ -455,9 +449,7 @@ class TransportClient : public CastTransport::Client {
       : run_one_benchmark_(run_one_benchmark) {}
 
   void OnStatusChanged(CastTransportStatus status) final {
-    bool result = (status == TRANSPORT_AUDIO_INITIALIZED ||
-                   status == TRANSPORT_VIDEO_INITIALIZED);
-    EXPECT_TRUE(result);
+    EXPECT_EQ(TRANSPORT_STREAM_INITIALIZED, status);
   };
   void OnLoggingEventsReceived(
       std::unique_ptr<std::vector<FrameEvent>> frame_events,