Introduce AcccessibilityManager

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 6617ce380f7166a973a412a82a617c80ceba561b..5abd23769fab61e984aeee779912c8c03697f934 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -23,7 +23,7 @@
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "chrome/browser/browser_process.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/app_mode/kiosk_app_launch_error.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h"
@@ -572,6 +572,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
 
   // Initialize magnification manager before ash tray is created. And this must
   // be placed after UserManager::SessionStarted();
+  chromeos::AccessibilityManager::Initialize();
   chromeos::MagnificationManager::Initialize();
 
   // Add observers for WallpaperManager. This depends on PowerManagerClient,
@@ -654,7 +655,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
         content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
         "Retail mode");
   }
-  chromeos::accessibility::Initialize();
 
   peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
 
@@ -795,6 +795,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
   contact_manager_.reset();
 
   chromeos::MagnificationManager::Shutdown();
+  chromeos::AccessibilityManager::Shutdown();
 
   // Let the UserManager and WallpaperManager unregister itself as an observer
   // of the CrosSettings singleton before it is destroyed.