Merge methods for configuring NACK/FEC/hybrid.

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

Index: webrtc/modules/video_coding/main/source/media_optimization.cc
diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/main/source/media_optimization.cc
index 4dbdf44d588897fe1424e1021ecf9ff9fc69c1ad..7f60c6c999d71978d831bf322ad9fe41a9213011 100644
--- a/webrtc/modules/video_coding/main/source/media_optimization.cc
+++ b/webrtc/modules/video_coding/main/source/media_optimization.cc
@@ -317,13 +317,8 @@ uint32_t MediaOptimization::SetTargetRates(
   return target_bit_rate_;
 }
 
-void MediaOptimization::EnableProtectionMethod(bool enable,
-                                               VCMProtectionMethodEnum method) {
+void MediaOptimization::SetProtectionMethod(VCMProtectionMethodEnum method) {
   CriticalSectionScoped lock(crit_sect_.get());
-  if (!enable && loss_prot_logic_->SelectedType() != method)
-    return;
-  if (!enable)
-    method = kNone;
   loss_prot_logic_->SetMethod(method);
 }