Restore switch kDisableWebRtcHWEncoding

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 221 matching lines @@
       new IpcPacketSocketFactory(p2p_socket_dispatcher_.get()));
 
   std::unique_ptr<cricket::WebRtcVideoDecoderFactory> decoder_factory;
   std::unique_ptr<cricket::WebRtcVideoEncoderFactory> encoder_factory;
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
     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));
     }
   }
 
 #if defined(OS_ANDROID)
   if (!media::MediaCodecUtil::SupportsSetParameters())
     encoder_factory.reset();
 #endif
 
   pc_factory_ = webrtc::CreatePeerConnectionFactory(
@@ skipping 297 matching lines @@
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   DCHECK(CalledOnValidThread());
   if (audio_device_.get())
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content