Enable MediaCapabilitiesQueryGpuFactories feature by default

Flag was added to make it mergeable to m85. m86 should just have it
enabled.

Bug: 1105258
Change-Id: If935e0a7027fb7433b6fda61ed7dc4ede0b6f42a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333339Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Auto-Submit: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795250}

media/base/media_switches.cc

@@ -245,7 +245,7 @@ const base::Feature kResumeBackgroundVideo {
 // When enabled, MediaCapabilities will check with GPU Video Accelerator
 // Factories to determine isPowerEfficient = true/false.
 const base::Feature kMediaCapabilitiesQueryGpuFactories{
-    "MediaCapabilitiesQueryGpuFactories", base::FEATURE_DISABLED_BY_DEFAULT};
+    "MediaCapabilitiesQueryGpuFactories", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enable Media Capabilities with finch-parameters.
 const base::Feature kMediaCapabilitiesWithParameters{

third_party/blink/renderer/modules/media_capabilities/media_capabilities_test.cc

@@ -522,6 +522,14 @@ TEST(MediaCapabilitiesTests, ConfigMatchesFeatures) {
 TEST(MediaCapabilitiesTests, NonIntegerFramerate) {
   MediaCapabilitiesTestContext context;
 
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitWithFeatures(
+      // Enabled features.
+      {},
+      // Disabled ML predictions + GpuFactories (just use DB).
+      {media::kMediaCapabilitiesQueryGpuFactories,
+       media::kMediaLearningSmoothnessExperiment});
+
   const auto* kDecodingConfig = CreateDecodingConfig();
   const media::mojom::blink::PredictionFeatures kFeatures = CreateFeatures();
 
@@ -550,10 +558,13 @@ TEST(MediaCapabilitiesTests, NonIntegerFramerate) {
 
 // Test smoothness predictions from DB (PerfHistoryService).
 TEST(MediaCapabilitiesTests, PredictWithJustDB) {
-  // Disable ML predictions (may/may not be disabled by default).
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(
-      media::kMediaLearningSmoothnessExperiment);
+  scoped_feature_list.InitWithFeatures(
+      // Enabled features.
+      {},
+      // Disabled ML predictions + GpuFactories (just use DB).
+      {media::kMediaCapabilitiesQueryGpuFactories,
+       media::kMediaLearningSmoothnessExperiment});
 
   MediaCapabilitiesTestContext context;
   const auto* kDecodingConfig = CreateDecodingConfig();
@@ -660,9 +671,12 @@ TEST(MediaCapabilitiesTests, PredictWithBadWindowMLService) {
   const double kBadWindowThreshold = 2;
   const double kNnrThreshold = -1;
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeatureWithParameters(
-      media::kMediaLearningSmoothnessExperiment,
-      MakeMlParams(kBadWindowThreshold, kNnrThreshold));
+  scoped_feature_list.InitWithFeaturesAndParameters(
+      // Enabled features w/ parameters
+      {{media::kMediaLearningSmoothnessExperiment,
+        MakeMlParams(kBadWindowThreshold, kNnrThreshold)}},
+      // Disabled GpuFactories (use DB for power).
+      {media::kMediaCapabilitiesQueryGpuFactories});
 
   MediaCapabilitiesTestContext context;
   const auto* kDecodingConfig = CreateDecodingConfig();
@@ -719,9 +733,12 @@ TEST(MediaCapabilitiesTests, PredictWithNnrMLService) {
   const double kBadWindowThreshold = -1;
   const double kNnrThreshold = 5;
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeatureWithParameters(
-      media::kMediaLearningSmoothnessExperiment,
-      MakeMlParams(kBadWindowThreshold, kNnrThreshold));
+  scoped_feature_list.InitWithFeaturesAndParameters(
+      // Enabled both ML services.
+      {{media::kMediaLearningSmoothnessExperiment,
+        MakeMlParams(kBadWindowThreshold, kNnrThreshold)}},
+      // Disabled features (use DB for power efficiency)
+      {media::kMediaCapabilitiesQueryGpuFactories});
 
   MediaCapabilitiesTestContext context;
   const auto* kDecodingConfig = CreateDecodingConfig();
@@ -780,9 +797,12 @@ TEST(MediaCapabilitiesTests, PredictWithBothMLServices) {
   const double kBadWindowThreshold = 2;
   const double kNnrThreshold = 1;
   base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeatureWithParameters(
-      media::kMediaLearningSmoothnessExperiment,
-      MakeMlParams(kBadWindowThreshold, kNnrThreshold));
+  scoped_feature_list.InitWithFeaturesAndParameters(
+      // Enabled both ML services.
+      {{media::kMediaLearningSmoothnessExperiment,
+        MakeMlParams(kBadWindowThreshold, kNnrThreshold)}},
+      // Disabled features (use DB for power efficiency)
+      {media::kMediaCapabilitiesQueryGpuFactories});
 
   MediaCapabilitiesTestContext context;
   const auto* kDecodingConfig = CreateDecodingConfig();