Merge methods for configuring NACK/FEC/hybrid.

BUG=webrtc:1695
R=stefan@webrtc.org

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

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

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);
 }