Merge methods for configuring NACK/FEC/hybrid.

webrtc/modules/video_coding/main/source/video_sender.cc

Index: webrtc/modules/video_coding/main/source/video_sender.cc
diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index fb04b0e871eb7b412aade36f4bfdc79bd5ba4804..53d5b22a0b1a8e8b5a073ba7fdd9501c36896d37 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -296,24 +296,21 @@ int32_t VideoSender::RegisterProtectionCallback(
 }
 
 // Enable or disable a video protection method.
-void VideoSender::SetVideoProtection(bool enable,
-                                     VCMVideoProtection videoProtection) {
+void VideoSender::SetVideoProtection(VCMVideoProtection videoProtection) {
   CriticalSectionScoped cs(_sendCritSect);
   switch (videoProtection) {
     case kProtectionNone:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNone);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNone);
       break;
     case kProtectionNack:
-    case kProtectionNackSender:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNack);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNack);
       break;
     case kProtectionNackFEC:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kNackFec);
+      _mediaOpt.SetProtectionMethod(media_optimization::kNackFec);
       break;
     case kProtectionFEC:
-      _mediaOpt.EnableProtectionMethod(enable, media_optimization::kFec);
+      _mediaOpt.SetProtectionMethod(media_optimization::kFec);
       break;
-    case kProtectionNackReceiver:
     case kProtectionKeyOnLoss:
     case kProtectionKeyOnKeyLoss:
       // Ignore receiver modes.