Restore switch kDisableWebRtcHWEncoding

content/browser/gpu/gpu_data_manager_impl_private.cc

 // Copyright (c) 2013 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/browser/gpu/gpu_data_manager_impl_private.h"
 
 #include <algorithm>
 #include <iterator>
 #include <memory>
 #include <utility>
@@ skipping 759 matching lines @@
 
 #if defined(OS_WIN)
   if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VPX_DECODE) &&
       gpu_preferences) {
     gpu_preferences->enable_accelerated_vpx_decode =
         gpu::GpuPreferences::VPX_VENDOR_NONE;
   }
 #endif
 
 #if BUILDFLAG(ENABLE_WEBRTC)
-  if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE) &&
-      !command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
-      !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding)) {
-    if (gpu_preferences) {
+if (IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE)) {
+#if defined (OS_ANDROID)
+  // On Android HW H264 is enabled by default behind a flag now, regardless of
+  // the blacklist. Disable HW encoding if every single HW codec is disabled.
+  // TODO(braveyao): remove this once the blacklist is removed
+  // (crbug.com/638664).
+  if (!base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding)) {
+#endif
+    if (!command_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
+      command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
+    if (gpu_preferences)
       gpu_preferences->disable_web_rtc_hw_encoding = true;
-    } else {
-      command_line->AppendSwitch(switches::kDisableWebRtcHWVP8Encoding);
-    }
+#if defined (OS_ANDROID)
   }
 #endif
+}
+#endif
 
   if (gpu_preferences) { // enable_es3_apis
     bool blacklisted = IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL2);
     bool enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableES3APIs);
     bool disabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kDisableES3APIs);
     gpu_preferences->enable_es3_apis = (enabled || !blacklisted) && !disabled;
   }
 
@@ skipping 531 matching lines @@
   gpu_info_.context_info_state = gpu::kCollectInfoFatalFailure;
 #if defined(OS_WIN)
   gpu_info_.dx_diagnostics_info_state = gpu::kCollectInfoFatalFailure;
 #endif
   complete_gpu_info_already_requested_ = true;
   // Some observers might be waiting.
   NotifyGpuInfoUpdate();
 }
 
 }  // namespace content