Introduce AcccessibilityManager

chrome/browser/automation/testing_automation_provider_chromeos.cc

Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index 357c0341d965aa2eeb9f093e2403820ba7161f89..ddc2bb8238e9e345b8ff6ee5be994dd58196472f 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -1189,7 +1190,7 @@ void TestingAutomationProvider::EnableSpokenFeedback(
   }
 
   if (user_manager->IsUserLoggedIn()) {
-    chromeos::accessibility::EnableSpokenFeedback(
+    chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
         enabled, NULL, ash::A11Y_NOTIFICATION_NONE);
   } else {
     ExistingUserController* controller =
@@ -1197,7 +1198,7 @@ void TestingAutomationProvider::EnableSpokenFeedback(
     chromeos::LoginDisplayHostImpl* webui_host =
         static_cast<chromeos::LoginDisplayHostImpl*>(
             controller->login_display_host());
-    chromeos::accessibility::EnableSpokenFeedback(
+    chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
         enabled,
         webui_host->GetOobeUI()->web_ui(),
         ash::A11Y_NOTIFICATION_NONE);
@@ -1210,8 +1211,9 @@ void TestingAutomationProvider::IsSpokenFeedbackEnabled(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  return_value->SetBoolean("spoken_feedback",
-                           chromeos::accessibility::IsSpokenFeedbackEnabled());
+  return_value->SetBoolean(
+      "spoken_feedback",
+      chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
   reply.SendSuccess(return_value.get());
 }