Introduce AcccessibilityManager

Introduce AcccessibilityManager 

AcccessibilityManager manages the per-user settings of high-contrast mode and spoken feedback and makes them syncable. These settings were pre-device and unsyncable before this patch.

AcccessibilityManager does:
- Observe the change of the login status and pref.
- Change the a11y setting as the status is changed.
- Be an interface to control a11y feature.

BUG=165597
TEST=manual, browser_tests pass 
R=derat@chromium.org, jhawkins@chromium.org, zork@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203819

[yoshiki, 2013-04-24 03:03:09]

@zork: could you take a look? Thanks,

[Zachary Kuznia, 2013-04-24 04:21:03]

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
File chrome/browser/chromeos/accessibility/accessibility_manager.cc (right):

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:158:
content::WebUI* login_web_ui,
Fix indent,.

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:255:
ash::AccessibilityNotificationVisibility notify) {
Fix indent, or newline after (

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:277:
AccessibilityManager::Get()->IsSpokenFeedbackEnabled())
Fix indent

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:316:
EnableSpokenFeedback(
Add a comment explaining this.

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:321:
EnableHighContrast(IsHighContrastEnabled());
Add a comment explaining this line.

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:325: if
(pref_change_registrar_) {
No {} for one line if clause.  Also, you can just call reset().

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
File chrome/browser/chromeos/accessibility/accessibility_manager.h (right):

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.h:24: bool enabled,
ash::AccessibilityNotificationVisibility notify)
line break after comma.

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.h:27: notify(notify)
{}
Don't inline constructors in header files.

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.h:50: static void
Initialize();
What pattern are these statics based on?  Why not use a singleton?

https://chromiumcodereview.appspot.com/14200048/diff/1/chrome/browser/chromeo...
chrome/browser/chromeos/accessibility/accessibility_manager.h:105:
content::NotificationRegistrar registrar_;
you have two registrars, so you should give this a name that implies its
purpose.

[yoshiki, 2013-04-24 06:00:52]

@zork: PTAL. Thanks,

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
File chrome/browser/chromeos/accessibility/accessibility_manager.cc (right):

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:158:
content::WebUI* login_web_ui,
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Fix indent,.

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:255:
ash::AccessibilityNotificationVisibility notify) {
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Fix indent, or newline after (

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:277:
AccessibilityManager::Get()->IsSpokenFeedbackEnabled())
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Fix indent

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:316:
EnableSpokenFeedback(
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Add a comment explaining this.

Changes the method name to indicate the operation.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:321:
EnableHighContrast(IsHighContrastEnabled());
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Add a comment explaining this line.

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.cc:325: if
(pref_change_registrar_) {
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> No {} for one line if clause.  Also, you can just call reset().

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
File chrome/browser/chromeos/accessibility/accessibility_manager.h (right):

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.h:24: bool enabled,
ash::AccessibilityNotificationVisibility notify)
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> line break after comma.

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.h:27: notify(notify)
{}
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> Don't inline constructors in header files.

Done.

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.h:50: static void
Initialize();
Before, derat@ said that Singleton causes more trouble than it's worth and
suggested this pattern when I implemented MagnificationManager. 

https://codereview.chromium.org/11280287/diff/1/chrome/browser/chromeos/acces...

On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> What pattern are these statics based on?  Why not use a singleton?

https://codereview.chromium.org/14200048/diff/1/chrome/browser/chromeos/acces...
chrome/browser/chromeos/accessibility/accessibility_manager.h:105:
content::NotificationRegistrar registrar_;
On 2013/04/24 04:21:03, Zachary Kuznia wrote:
> you have two registrars, so you should give this a name that implies its
> purpose.

Done.

[Zachary Kuznia, 2013-04-25 08:17:14]

lgtm

[yoshiki, 2013-04-25 09:47:56]

@derat, @jhawkins: Could you OWNER-review for following files? Thanks.

@derat:
- chrome/browser/chromeos/*
- chrome/browser/ui/ash/*

@jhawkins:
- chrome/browser/resources/options/
- chrome/browser/ui/webui/options/*

[yoshiki, 2013-04-26 03:04:37]

@derat, @jhawkins: Could you OWNER-review for following files? Thanks.

@derat:
- chrome/browser/chromeos/*
- chrome/browser/ui/ash/*

@jhawkins:
- chrome/browser/resources/options/
- chrome/browser/ui/webui/options/*

[Daniel Erat, 2013-04-26 13:58:58]

LGTM for OWNERS after some comments are addressed

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/accessibility_manager.h (right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:42: // Creates an
instance of AccessibilityManager. This should be called once,
nit: s/,/./

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:43: // Returns the
existing instance. If there is no instance, creates one.
this doesn't look like it returns anything

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:44: // because
only one instance should exist at the same time.
i don't understand the "if there is no instance" note.  the comment says it
should only be called once, so there should never be an instance when it's
called, right?

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:48: // Returns the
existing instance. If there is no instance, returns NULL.
this comment is wrong -- it crashes if there's no instance

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:71: void
MaybeSpeak(const std::string& utterance);
can the parameter names for Speak() and MaybeSpeak() be the same (instead of
text vs. utterance)?

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:79: // For test
nit: remove unnecessary comment

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:94: //
content::NotificationObserver implimentation:
nit: s/implimentation/implementation/

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:47: 
needs a virtual d'tor

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:83:
};
DISALLOW_COPY_AND_ASSIGN

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:102:
Profile* profile() {
i don't think i've seen inline-style lowercase naming for non-class functions
before.  mind renaming this to GetProfile()?

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:108:
PrefService* prefs() {
same here

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:170:
// Logs in
nit: add trailing period

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:219:
// Logs in
nit: add trailing period (or remove unnecessary comment)

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:262:
// Logs in
here too

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc:115:
details).ptr();
i think you can unwrap this line now

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc:46:
details).ptr();
i think you can unwrap this line now

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/system/ash_system_tray_delegate.cc (right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/s...
chrome/browser/chromeos/system/ash_system_tray_delegate.cc:1323: details).ptr();
unwrap this too?

[yoshiki, 2013-05-24 18:49:44]

Thanks!

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/accessibility_manager.h (right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:42: // Creates an
instance of AccessibilityManager. This should be called once,
On 2013/04/26 13:58:58, Daniel Erat wrote:
> nit: s/,/./

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:43: // Returns the
existing instance. If there is no instance, creates one.
On 2013/04/26 13:58:58, Daniel Erat wrote:
> this doesn't look like it returns anything

Done. Fixed the comment.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:44: // because
only one instance should exist at the same time.
On 2013/04/26 13:58:58, Daniel Erat wrote:
> i don't understand the "if there is no instance" note.  the comment says it
> should only be called once, so there should never be an instance when it's
> called, right?

You're right. The comment was wrong. Fixed.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:48: // Returns the
existing instance. If there is no instance, returns NULL.
On 2013/04/26 13:58:58, Daniel Erat wrote:
> this comment is wrong -- it crashes if there's no instance

Changed the implementation to match with the comments.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:71: void
MaybeSpeak(const std::string& utterance);
On 2013/04/26 13:58:58, Daniel Erat wrote:
> can the parameter names for Speak() and MaybeSpeak() be the same (instead of
> text vs. utterance)?

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:79: // For test
On 2013/04/26 13:58:58, Daniel Erat wrote:
> nit: remove unnecessary comment

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager.h:94: //
content::NotificationObserver implimentation:
On 2013/04/26 13:58:58, Daniel Erat wrote:
> nit: s/implimentation/implementation/

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:47: 
On 2013/04/26 13:58:58, Daniel Erat wrote:
> needs a virtual d'tor

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:83:
};
On 2013/04/26 13:58:58, Daniel Erat wrote:
> DISALLOW_COPY_AND_ASSIGN

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:102:
Profile* profile() {
On 2013/04/26 13:58:58, Daniel Erat wrote:
> i don't think i've seen inline-style lowercase naming for non-class functions
> before.  mind renaming this to GetProfile()?

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:108:
PrefService* prefs() {
On 2013/04/26 13:58:58, Daniel Erat wrote:
> same here

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:170:
// Logs in
On 2013/04/26 13:58:58, Daniel Erat wrote:
> nit: add trailing period

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:219:
// Logs in
On 2013/04/26 13:58:58, Daniel Erat wrote:
> nit: add trailing period (or remove unnecessary comment)

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc:262:
// Logs in
On 2013/04/26 13:58:58, Daniel Erat wrote:
> here too

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/magnification_manager_browsertest.cc:115:
details).ptr();
On 2013/04/26 13:58:58, Daniel Erat wrote:
> i think you can unwrap this line now

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
File chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc
(right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/a...
chrome/browser/chromeos/accessibility/magnification_manager_unittest.cc:46:
details).ptr();
On 2013/04/26 13:58:58, Daniel Erat wrote:
> i think you can unwrap this line now

Done.

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/s...
File chrome/browser/chromeos/system/ash_system_tray_delegate.cc (right):

https://codereview.chromium.org/14200048/diff/11001/chrome/browser/chromeos/s...
chrome/browser/chromeos/system/ash_system_tray_delegate.cc:1323: details).ptr();
On 2013/04/26 13:58:58, Daniel Erat wrote:
> unwrap this too?

Done.

[yoshiki, 2013-05-24 18:51:24]

@jhawkins: Could you do an OWNER-review? Thanks.
- chrome/browser/resources/options/browser_options.html
- chrome/browser/ui/webui/options/*

[yoshiki, 2013-05-30 14:00:03]

@jhawkins: Ping.

[James Hawkins, 2013-05-30 16:32:57]

lgtm

[commit-bot: I haz the power, 2013-05-31 04:40:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/14200048/66001

[commit-bot: I haz the power, 2013-05-31 04:40:57]

Failed to apply patch for
chrome/browser/chromeos/system/tray_accessibility_browsertest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
  Hunk #2 FAILED at 148.
  Hunk #3 succeeded at 212 (offset 44 lines).
  Hunk #4 FAILED at 187.
  Hunk #5 FAILED at 209.
  Hunk #6 succeeded at 266 (offset 37 lines).
  Hunk #7 succeeded at 292 (offset 33 lines).
  Hunk #8 succeeded at 314 (offset 33 lines).
  Hunk #9 succeeded at 340 (offset 32 lines).
  Hunk #10 succeeded at 362 (offset 32 lines).
  Hunk #11 succeeded at 388 with fuzz 2 (offset 26 lines).
  Hunk #12 succeeded at 396 (offset 26 lines).
  Hunk #13 succeeded at 410 with fuzz 2 (offset 26 lines).
  Hunk #14 succeeded at 453 (offset 26 lines).
  Hunk #15 succeeded at 462 (offset 26 lines).
  Hunk #16 succeeded at 471 (offset 26 lines).
  Hunk #17 succeeded at 479 (offset 26 lines).
  Hunk #18 succeeded at 503 (offset 26 lines).
  Hunk #19 succeeded at 514 (offset 26 lines).
  3 out of 19 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/system/tray_accessibility_browsertest.cc.rej

Patch:       chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index
d70ab70bb9b6dc9cecacccdb935c2bbdb6067397..7353d187d79c27bc9d79e5139bf54ef42ea2a3e7
100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -10,7 +10,7 @@
 #include "base/command_line.h"
 #include "base/prefs/pref_service.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/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -148,15 +148,17 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest,
ShowTrayIcon) {
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Toggling spoken feedback changes the visibillity of the icon.
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Toggling high contrast the visibillity of the icon.
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Toggling magnifier the visibillity of the icon.
@@ -168,13 +170,15 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest,
ShowTrayIcon) {
   // Enabling all accessibility features.
   SetMagnifierEnabled(true);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_TRUE(IsTrayIconVisible());
   SetMagnifierEnabled(false);
   EXPECT_FALSE(IsTrayIconVisible());
@@ -185,9 +189,9 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, ShowTrayIcon)
{
   PrefService* prefs = profile->GetPrefs();
   prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, true);
   prefs->CommitPendingWrite();
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_FALSE(IsTrayIconVisible());
 }
 
@@ -207,15 +211,17 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, ShowMenu) {
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Toggling spoken feedback changes the visibillity of the menu.
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Toggling high contrast changes the visibillity of the menu.
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Toggling screen magnifier changes the visibillity of the menu.
@@ -227,13 +233,15 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, ShowMenu) {
   // Enabling all accessibility features.
   SetMagnifierEnabled(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
   SetMagnifierEnabled(false);
   EXPECT_FALSE(CanCreateMenuItem());
@@ -255,15 +263,17 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest,
ShowMenuWithShowMenuOption) {
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling spoken feedback.
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling high contrast.
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling screen magnifier.
@@ -275,13 +285,15 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest,
ShowMenuWithShowMenuOption) {
   // Enabling all accessibility features.
   SetMagnifierEnabled(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
   SetMagnifierEnabled(false);
   EXPECT_TRUE(CanCreateMenuItem());
@@ -300,15 +312,17 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest,
ShowMenuWithShowOnLoginScreen) {
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling spoken feedback.
-  accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableSpokenFeedback(false, NULL,
ash::A11Y_NOTIFICATION_NONE);
+  AccessibilityManager::Get()->EnableSpokenFeedback(
+      false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling high contrast.
-  accessibility::EnableHighContrast(true);
+  AccessibilityManager::Get()->EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
-  accessibility::EnableHighContrast(false);
+  AccessibilityManager::Get()->EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling screen magnifier.
@@ -320,13 +334,15 @@ IN_PROC_BROWSER_TEST_F(TrayAccessibil…
(message too large)

[commit-bot: I haz the power, 2013-05-31 04:44:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/14200048/72001

[commit-bot: I haz the power, 2013-05-31 04:56:55]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[commit-bot: I haz the power, 2013-05-31 05:16:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/14200048/76002

[commit-bot: I haz the power, 2013-05-31 06:13:07]

Retried try job too often on linux_chromeos for step(s) unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-06-03 16:09:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoshiki@chromium.org/14200048/104001

[yoshiki, 2013-06-04 03:14:54]

Committed patchset #7 manually as r203819 (presubmit successful).