Introduce AcccessibilityManager

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 199f8d81b9fbed4b658c302724ee4eef63445194..753cb86989e3d7101fa1d269a32b519493eb9884 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -8,7 +8,7 @@
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
@@ -112,16 +112,19 @@ void ChromeShellDelegate::OpenCrosh() {
 }
 
 void ChromeShellDelegate::ToggleHighContrast() {
-  bool enabled = chromeos::accessibility::IsHighContrastEnabled();
-  chromeos::accessibility::EnableHighContrast(!enabled);
+  DCHECK(chromeos::AccessibilityManager::Get());
+  bool enabled = chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
+  chromeos::AccessibilityManager::Get()->EnableHighContrast(!enabled);
 }
 
 bool ChromeShellDelegate::IsSpokenFeedbackEnabled() const {
-  return chromeos::accessibility::IsSpokenFeedbackEnabled();
+  DCHECK(chromeos::AccessibilityManager::Get());
+  return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
 }
 
 void ChromeShellDelegate::ToggleSpokenFeedback(
     ash::AccessibilityNotificationVisibility notify) {
+  DCHECK(chromeos::AccessibilityManager::Get());
   content::WebUI* web_ui = NULL;
 
   chromeos::LoginDisplayHostImpl* host =
@@ -136,11 +139,12 @@ void ChromeShellDelegate::ToggleSpokenFeedback(
     web_ui = chromeos::ScreenLocker::default_screen_locker()->
         GetAssociatedWebUI();
   }
-  chromeos::accessibility::ToggleSpokenFeedback(web_ui, notify);
+  chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(web_ui, notify);
 }
 
 bool ChromeShellDelegate::IsHighContrastEnabled() const {
-  return chromeos::accessibility::IsHighContrastEnabled();
+  DCHECK(chromeos::AccessibilityManager::Get());
+  return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
 }
 
 bool ChromeShellDelegate::IsMagnifierEnabled() const {