Android: enable WebRTC HW H264 with a flag by default

content/public/browser/gpu_utils.cc

 // Copyright 2016 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/public/browser/gpu_utils.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
+#include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/config/gpu_switches.h"
 #include "media/media_features.h"
 #include "ui/gl/gl_switches.h"
 
 namespace {
 
 bool GetUintFromSwitch(const base::CommandLine* command_line,
                        const base::StringPiece& switch_string,
@@ skipping 20 matching lines @@
   gpu_preferences.ui_prioritize_in_gpu_process =
       command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess);
   gpu_preferences.disable_accelerated_video_decode =
       command_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
 #if defined(OS_CHROMEOS)
   gpu_preferences.disable_vaapi_accelerated_video_encode =
       command_line->HasSwitch(switches::kDisableVaapiAcceleratedVideoEncode);
 #endif
 #if BUILDFLAG(ENABLE_WEBRTC)
   gpu_preferences.disable_web_rtc_hw_encoding =
-      command_line->HasSwitch(switches::kDisableWebRtcHWEncoding) &&
-      command_line->GetSwitchValueASCII(switches::kDisableWebRtcHWEncoding)
-          .empty();
+      command_line->HasSwitch(switches::kDisableWebRtcHWVP8Encoding) &&
+      !base::FeatureList::IsEnabled(features::kWebRtcHWH264Encoding);
 #endif
 #if defined(OS_WIN)
   uint32_t enable_accelerated_vpx_decode_val =
       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
   if (GetUintFromSwitch(command_line, switches::kEnableAcceleratedVpxDecode,
                         &enable_accelerated_vpx_decode_val)) {
     gpu_preferences.enable_accelerated_vpx_decode =
         static_cast<gpu::GpuPreferences::VpxDecodeVendors>(
             enable_accelerated_vpx_decode_val);
   }
@@ skipping 47 matching lines @@
   gpu_preferences.enable_gpu_service_tracing =
       command_line->HasSwitch(switches::kEnableGPUServiceTracing);
   gpu_preferences.use_passthrough_cmd_decoder =
       command_line->HasSwitch(switches::kUsePassthroughCmdDecoder);
   // Some of these preferences are set or adjusted in
   // GpuDataManagerImplPrivate::AppendGpuCommandLine.
   return gpu_preferences;
 }
 
 }  // namespace content