Turn back spoken feedback setting into a system-wide (non-per-user) preference

chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

Index: chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
index c08606f4682b84424060dcc6e56a110f6dd1b17e..520c73e7e54aa0eee1d3fab877895efd98b61ebd 100644
--- a/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
+++ b/chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc
@@ -262,30 +262,6 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,
 }
 
 IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,
-                       DeviceLoginScreenDefaultSpokenFeedbackEnabled) {
-  // Verifies that the default state of the spoken feedback accessibility
-  // feature on the login screen can be controlled through device policy.
-
-  // Enable spoken feedback through device policy and wait for the change to
-  // take effect.
-  em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
-  proto.mutable_accessibility_settings()->
-      set_login_screen_default_spoken_feedback_enabled(true);
-  RefreshDevicePolicyAndWaitForPrefChange(prefs::kSpokenFeedbackEnabled);
-
-  // Verify that the pref which controls spoken feedback in the login profile
-  // has changed to the policy-supplied default.
-  VerifyPrefFollowsRecommendation(prefs::kSpokenFeedbackEnabled,
-                                  base::FundamentalValue(true));
-
-  // Verify that spoken feedback is enabled.
-  chromeos::AccessibilityManager* accessibility_manager =
-      chromeos::AccessibilityManager::Get();
-  ASSERT_TRUE(accessibility_manager);
-  EXPECT_TRUE(accessibility_manager->IsSpokenFeedbackEnabled());
-}
-
-IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,
                        DeviceLoginScreenDefaultHighContrastEnabled) {
   // Verifies that the default state of the high contrast mode accessibility
   // feature on the login screen can be controlled through device policy.
@@ -361,30 +337,6 @@ IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
 }
 
 IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
-                       DeviceLoginScreenDefaultSpokenFeedbackEnabled) {
-  // Verifies that changing the default state of the spoken feedback
-  // accessibility feature on the login screen through policy does not affect
-  // its state in a session.
-
-  // Enable spoken feedback through device policy and wait for the change to
-  // take effect.
-  em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
-  proto.mutable_accessibility_settings()->
-      set_login_screen_default_spoken_feedback_enabled(true);
-  RefreshDevicePolicyAndWaitForPrefChange(prefs::kSpokenFeedbackEnabled);
-
-  // Verify that the pref which controls the spoken feedback in the session is
-  // unchanged.
-  VerifyPrefFollowsDefault(prefs::kSpokenFeedbackEnabled);
-
-  // Verify that spoken feedback is disabled.
-  chromeos::AccessibilityManager* accessibility_manager =
-      chromeos::AccessibilityManager::Get();
-  ASSERT_TRUE(accessibility_manager);
-  EXPECT_FALSE(accessibility_manager->IsSpokenFeedbackEnabled());
-}
-
-IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
                        DeviceLoginScreenDefaultHighContrastEnabled) {
   // Verifies that changing the default state of the high contrast mode
   // accessibility feature on the login screen through policy does not affect