Ambient EQ: Only gate on feature, don't check sensor

- This disables the feature by default
- Updates tests based on changed feature state
- Fixes a race condition checking the sensor status via powerd
- Support for ambient EQ is now going to be gated on a cros config value
  because some devices have the sensor but can't support the feature
- The cros config value will enable the feature only on explicitly
  supported devices
- This is a partial revert of [1] which can't be cleanly reverted
  because the pref value on unsupported devices may have already
  been set

[1] - https://chromium-review.googlesource.com/c/chromium/src/+/1974815

BUG=1034068,1036038,1036546
TEST=NightLightTest.*,manual

Change-Id: If51ec1b6a8ae787fb64b89f2f536eec0087b09af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992183Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Bailey Berro <baileyberro@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730247}

ash/public/cpp/ash_features.cc

@@ -13,7 +13,7 @@ namespace ash {
 namespace features {
 
 const base::Feature kAllowAmbientEQ{"AllowAmbientEQ",
-                                    base::FEATURE_ENABLED_BY_DEFAULT};
+                                    base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kAutoNightLight{"AutoNightLight",
                                     base::FEATURE_DISABLED_BY_DEFAULT};

ash/system/night_light/night_light_controller_impl.cc

@@ -568,10 +568,7 @@ void NightLightControllerImpl::SetAmbientColorEnabled(bool enabled) {
 }
 
 bool NightLightControllerImpl::GetAmbientColorEnabled() const {
-  const bool ambient_eq_supported =
-      features::IsAllowAmbientEQEnabled() &&
-      chromeos::PowerManagerClient::Get()->SupportsAmbientColor();
-  return ambient_eq_supported && active_user_pref_service_ &&
+  return features::IsAllowAmbientEQEnabled() && active_user_pref_service_ &&
          active_user_pref_service_->GetBoolean(prefs::kAmbientColorEnabled);
 }
 

ash/system/night_light/night_light_controller_unittest.cc

@@ -28,7 +28,6 @@
 #include "base/optional.h"
 #include "base/strings/pattern.h"
 #include "base/test/scoped_feature_list.h"
-#include "chromeos/dbus/power/fake_power_manager_client.h"
 #include "components/prefs/pref_service.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/fake/fake_display_snapshot.h"
@@ -196,7 +195,6 @@ class NightLightTest : public NoSessionAshTestBase {
 
     // Start with ambient color pref disabled.
     SetAmbientColorPrefEnabled(false);
-    SetAmbientColorSupported(false);
   }
 
   void CreateTestUserSessions() {
@@ -219,12 +217,6 @@ class NightLightTest : public NoSessionAshTestBase {
     GetController()->SetAmbientColorEnabled(enabled);
   }
 
-  void SetAmbientColorSupported(bool supported) {
-    static_cast<chromeos::FakePowerManagerClient*>(
-        chromeos::PowerManagerClient::Get())
-        ->set_supports_ambient_color(supported);
-  }
-
   // Simulate powerd sending multiple times an ambient temperature of
   // |powerd_temperature|. The remapped ambient temperature should eventually
   // reach |target_remapped_temperature|.
@@ -999,52 +991,31 @@ TEST_F(NightLightTest, TestCustomScheduleInvertedStartAndEndTimesCase3) {
             controller->timer()->GetCurrentDelay());
 }
 
-TEST_F(NightLightTest, TestAmbientLightEnabledSetting) {
-  // Feature enabled, Device not supported, Pref disabled -> disabled
-  SetAmbientColorPrefEnabled(false);
-  SetAmbientColorSupported(false);
-  EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
+TEST_F(NightLightTest, TestAmbientLightEnabledSetting_FeatureOn) {
+  base::test::ScopedFeatureList features;
+  features.InitAndEnableFeature(features::kAllowAmbientEQ);
 
-  // Feature enabled, Device not supported, Pref enabled -> disabled
-  SetAmbientColorPrefEnabled(true);
-  SetAmbientColorSupported(false);
-  EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
-
-  // Feature enabled, Device not supported, Pref enabled -> disabled
+  // Feature enabled, Pref disabled -> disabled
   SetAmbientColorPrefEnabled(false);
-  SetAmbientColorSupported(true);
   EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
 
-  // Feature enabled, Device supported, Pref enabled -> enabled
+  // Feature enabled, Pref enabled -> enabled
   SetAmbientColorPrefEnabled(true);
-  SetAmbientColorSupported(true);
   EXPECT_TRUE(GetController()->GetAmbientColorEnabled());
+}
 
+TEST_F(NightLightTest, TestAmbientLightEnabledSetting_FeatureOff) {
   // With the feature disabled it should always be disabled.
-  {
-    base::test::ScopedFeatureList features;
-    features.InitAndDisableFeature(features::kAllowAmbientEQ);
-
-    // Feature disabled, Device not supported, Pref disabled -> disabled
-    SetAmbientColorPrefEnabled(false);
-    SetAmbientColorSupported(false);
-    EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
-
-    // Feature disabled, Device not supported, Pref enabled -> disabled
-    SetAmbientColorPrefEnabled(true);
-    SetAmbientColorSupported(false);
-    EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
+  base::test::ScopedFeatureList features;
+  features.InitAndDisableFeature(features::kAllowAmbientEQ);
 
-    // Feature disabled, Device not supported, Pref enabled -> disabled
-    SetAmbientColorPrefEnabled(false);
-    SetAmbientColorSupported(true);
-    EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
+  // Feature disabled, Pref disabled -> disabled
+  SetAmbientColorPrefEnabled(false);
+  EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
 
-    // Feature disabled, Device supported, Pref enabled -> disabled
-    SetAmbientColorPrefEnabled(true);
-    SetAmbientColorSupported(true);
-    EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
-  }
+  // Feature disabled, Pref enabled -> disabled
+  SetAmbientColorPrefEnabled(true);
+  EXPECT_FALSE(GetController()->GetAmbientColorEnabled());
 }
 
 TEST_F(NightLightTest, TestAmbientLightRemappingTemperature) {
@@ -1082,9 +1053,10 @@ TEST_F(NightLightTest, TestAmbientLightRemappingTemperature) {
 }
 
 TEST_F(NightLightTest, TestAmbientColorMatrix) {
+  base::test::ScopedFeatureList features;
+  features.InitAndEnableFeature(features::kAllowAmbientEQ);
   SetNightLightEnabled(false);
   SetAmbientColorPrefEnabled(true);
-  SetAmbientColorSupported(true);
   auto scaling_factors = GetAllDisplaysCompositorsRGBScaleFactors();
   // If no temperature is set, we expect 1.0 for each scaling factor.
   for (const gfx::Vector3dF& rgb : scaling_factors) {
@@ -1113,12 +1085,14 @@ TEST_F(NightLightTest, TestAmbientColorMatrix) {
 }
 
 TEST_F(NightLightTest, TestNightLightAndAmbientColorInteraction) {
+  base::test::ScopedFeatureList features;
+  features.InitAndEnableFeature(features::kAllowAmbientEQ);
+
   SetNightLightEnabled(true);
 
   auto night_light_rgb = GetAllDisplaysCompositorsRGBScaleFactors().front();
 
   SetAmbientColorPrefEnabled(true);
-  SetAmbientColorSupported(true);
 
   auto night_light_and_ambient_rgb =
       GetAllDisplaysCompositorsRGBScaleFactors().front();

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -99,7 +99,6 @@
 #include "chrome/common/webui_url_constants.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "chromeos/constants/chromeos_switches.h"
-#include "chromeos/dbus/power/power_manager_client.h"
 #include "chromeos/services/assistant/public/features.h"
 #include "chromeos/services/multidevice_setup/public/cpp/url_provider.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
@@ -1091,10 +1090,8 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) {
   html_source->AddBoolean("listAllDisplayModes",
                           display::features::IsListAllDisplayModesEnabled());
 
-  const bool ambient_eq_supported =
-      ash::features::IsAllowAmbientEQEnabled() &&
-      chromeos::PowerManagerClient::Get()->SupportsAmbientColor();
-  html_source->AddBoolean("deviceSupportsAmbientColor", ambient_eq_supported);
+  html_source->AddBoolean("deviceSupportsAmbientColor",
+                          ash::features::IsAllowAmbientEQEnabled());
 
   html_source->AddBoolean(
       "enableTouchCalibrationSetting",