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

chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

 // Copyright 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 <string>
 
 #include "ash/magnifier/magnifier_constants.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 244 matching lines @@
                                   base::FundamentalValue(true));
 
   // Verify that the large cursor is enabled.
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   ASSERT_TRUE(accessibility_manager);
   EXPECT_TRUE(accessibility_manager->IsLargeCursorEnabled());
 }
 
 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.
 
   // Enable high contrast mode 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_high_contrast_enabled(true);
   RefreshDevicePolicyAndWaitForPrefChange(prefs::kHighContrastEnabled);
@@ skipping 55 matching lines @@
   VerifyPrefFollowsDefault(prefs::kLargeCursorEnabled);
 
   // Verify that the large cursor is disabled.
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   ASSERT_TRUE(accessibility_manager);
   EXPECT_FALSE(accessibility_manager->IsLargeCursorEnabled());
 }
 
 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
   // its state in a session.
 
   // Enable high contrast mode 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_high_contrast_enabled(true);
@@ skipping 30 matching lines @@
   // Verify that the screen magnifier is disabled.
   chromeos::MagnificationManager* magnification_manager =
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
   EXPECT_EQ(ash::kDefaultMagnifierType,
             magnification_manager->GetMagnifierType());
 }
 
 } // namespace policy