Introduce AcccessibilityManager

chrome/browser/automation/testing_automation_provider_chromeos.cc

 // Copyright (c) 2012 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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #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"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
@@ skipping 1152 matching lines @@
     reply.SendError("Invalid or missing args.");
     return;
   }
   const UserManager* user_manager = UserManager::Get();
   if (!user_manager) {
     reply.SendError("No user manager!");
     return;
   }
 
   if (user_manager->IsUserLoggedIn()) {
-    chromeos::accessibility::EnableSpokenFeedback(
+    chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
         enabled, NULL, ash::A11Y_NOTIFICATION_NONE);
   } else {
     ExistingUserController* controller =
         ExistingUserController::current_controller();
     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);
   }
 
   reply.SendSuccess(return_value.get());
 }
 
 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());
 }
 
 void TestingAutomationProvider::GetTimeInfo(Browser* browser,
                                             DictionaryValue* args,
                                             IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   base::Time time(base::Time::Now());
   bool use_24hour_clock = browser && browser->profile()->GetPrefs()->GetBoolean(
       prefs::kUse24HourClock);
@@ skipping 115 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }