Remove workaround for bug 6986

webrtc/voice_engine/channel.cc

Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 1d54821a50c882d1e85a7426295948c475333f0b..8fa4d1c9327e2d9abfce460f1986eecd133c4064 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -1377,20 +1377,7 @@ int32_t Channel::SetRecPayloadType(int payload_type,
     return -1;
   }
 
-  const CodecInst codec = [&] {
-    CodecInst c = SdpToCodecInst(payload_type, format);
-
-    // Bug 6986: Emulate an old bug that caused us to always choose to decode
-    // Opus in stereo. To be able to remove this, we first need to fix the
-    // other half of bug 6986, which is about losing the Opus "stereo"
-    // parameter.
-    // TODO(kwiberg): Remove this special case, a.k.a. fix bug 6986.
-    if (STR_CASE_CMP(codec.plname, "opus") == 0) {
-      c.channels = 2;
-    }
-
-    return c;
-  }();
+  const CodecInst codec = SdpToCodecInst(payload_type, format);
 
   if (payload_type == -1) {
     // De-register the selected codec (RTP/RTCP module and ACM)