Restore switch kDisableWebRtcHWEncoding

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index fab9910a86b994e9326a5b528aa963a5a9882d2a..fa04fbee526e60aa92fb2340e55577d2c33a81f2 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -239,8 +239,9 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(
     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
       decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
 
-    if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) ||
-        base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding)) {
+    if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding) &&
+        (!cmd_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) ||
+         base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding))) {
       encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
     }
   }