Generalize FlexfecReceiveStream::Config. (CL1)

webrtc/call/call_unittest.cc

Index: webrtc/call/call_unittest.cc
diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc
index 2d75be5eda5a39058056e68c2a6bcc9e8bb6e082..56b5705057bcdfa6bc5a7a24f49e64deb73ebdf6 100644
--- a/webrtc/call/call_unittest.cc
+++ b/webrtc/call/call_unittest.cc
@@ -223,8 +223,8 @@ TEST(CallTest, CreateDestroy_AssociateAudioSendReceiveStreams_SendFirst) {
 TEST(CallTest, CreateDestroy_FlexfecReceiveStream) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
-  config.flexfec_ssrc = 38837212;
+  config.payload_type = 118;
+  config.remote_ssrc = 38837212;
   config.protected_media_ssrcs = {27273};
 
   FlexfecReceiveStream* stream = call->CreateFlexfecReceiveStream(config);
@@ -235,12 +235,12 @@ TEST(CallTest, CreateDestroy_FlexfecReceiveStream) {
 TEST(CallTest, CreateDestroy_FlexfecReceiveStreams) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
+  config.payload_type = 118;
   std::list<FlexfecReceiveStream*> streams;
 
   for (int i = 0; i < 2; ++i) {
     for (uint32_t ssrc = 0; ssrc < 1234567; ssrc += 34567) {
-      config.flexfec_ssrc = ssrc;
+      config.remote_ssrc = ssrc;
       config.protected_media_ssrcs = {ssrc + 1};
       FlexfecReceiveStream* stream = call->CreateFlexfecReceiveStream(config);
       EXPECT_NE(stream, nullptr);
@@ -260,27 +260,27 @@ TEST(CallTest, CreateDestroy_FlexfecReceiveStreams) {
 TEST(CallTest, MultipleFlexfecReceiveStreamsProtectingSingleVideoStream) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
+  config.payload_type = 118;
   config.protected_media_ssrcs = {1324234};
   FlexfecReceiveStream* stream;
   std::list<FlexfecReceiveStream*> streams;
 
-  config.flexfec_ssrc = 838383;
+  config.remote_ssrc = 838383;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 424993;
+  config.remote_ssrc = 424993;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 99383;
+  config.remote_ssrc = 99383;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 5548;
+  config.remote_ssrc = 5548;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);