Remove dependency on NotificationService for cros a11y settings.

chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc

 // Copyright (c) 2013 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/chromeos/accessibility/accessibility_manager.h"
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 24 matching lines @@
 namespace {
 
 const char kTestUserName[] = "owner@invalid.domain";
 
 const int kTestAutoclickDelayMs = 2000;
 
 // Test user name for locally managed user. The domain part must be matched
 // with UserManager::kLocallyManagedUserDomain.
 const char kTestLocallyManagedUserName[] = "test@locally-managed.localhost";
 
-class MockAccessibilityObserver : public content::NotificationObserver {
+class MockAccessibilityObserver {
  public:
   MockAccessibilityObserver() : observed_(false),
                                 observed_enabled_(false),
-                                observed_type_(-1) {
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK,
-        content::NotificationService::AllSources());
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE,
-        content::NotificationService::AllSources());
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD,
-        content::NotificationService::AllSources());
+                                observed_type_(-1)
+  {
+    AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
+    CHECK(accessibility_manager);
+    accessibility_subscription_ = accessibility_manager->RegisterCallback(
+        base::Bind(&MockAccessibilityObserver::OnAccessibilityStatusChanged,
+                   base::Unretained(this)));
   }
+
   virtual ~MockAccessibilityObserver() {}
 
   bool observed() const { return observed_; }
   bool observed_enabled() const { return observed_enabled_; }
   int observed_type() const { return observed_type_; }
 
   void reset() { observed_ = false; }
 
  private:
-  // content::NotificationObserver implimentation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    AccessibilityStatusEventDetails* accessibility_status =
-        content::Details<AccessibilityStatusEventDetails>(
-            details).ptr();
-    ASSERT_FALSE(observed_);
-
-    switch (type) {
-      case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK:
-        observed_ = true;
-        observed_enabled_ = accessibility_status->enabled;
-        observed_type_ = type;
-        break;
-      case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE:
-        observed_ = true;
-        observed_enabled_ = accessibility_status->enabled;
-        observed_type_ = type;
-        break;
-      case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD:
-        observed_ = true;
-        observed_enabled_ = accessibility_status->enabled;
-        observed_type_ = type;
-        break;
+  void OnAccessibilityStatusChanged(
+      const AccessibilityStatusEventDetails& details) {
+    if (details.notification_type != ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER) {
+      observed_type_ = details.notification_type;
+      observed_enabled_ = details.enabled;
+      observed_ = true;
     }
   }
 
   bool observed_;
   bool observed_enabled_;
   int observed_type_;
 
-  content::NotificationRegistrar registrar_;
+  scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAccessibilityObserver);
 };
 
 class MockBrailleController : public StubBrailleController {
  public:
 
   MockBrailleController() : available_(false), observer_(NULL) {}
 
   virtual scoped_ptr<DisplayState> GetDisplayState() OVERRIDE {
@@ skipping 349 matching lines @@
   UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true);
   UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
   observer.reset();
 
   SetSpokenFeedbackEnabled(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
+            ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
 
   observer.reset();
   SetSpokenFeedbackEnabled(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
+            ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
 
   observer.reset();
   SetHighContrastEnabled(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
+            ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
   EXPECT_TRUE(IsHighContrastEnabled());
 
   observer.reset();
   SetHighContrastEnabled(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
+            ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
   EXPECT_FALSE(IsHighContrastEnabled());
 
   observer.reset();
   SetVirtualKeyboardEnabled(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
+            ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
   EXPECT_TRUE(IsVirtualKeyboardEnabled());
 
   observer.reset();
   SetVirtualKeyboardEnabled(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
+            ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityManagerTest,
                        ChangingTypePrefInvokesNotification) {
   MockAccessibilityObserver observer;
 
   // Logs in.
   UserManager::Get()->UserLoggedIn(kTestUserName, kTestUserName, true);
   UserManager::Get()->SessionStarted();
 
   EXPECT_FALSE(observer.observed());
   observer.reset();
 
   SetSpokenFeedbackEnabledPref(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
+            ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
   EXPECT_TRUE(IsSpokenFeedbackEnabled());
 
   observer.reset();
   SetSpokenFeedbackEnabledPref(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
+            ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK);
   EXPECT_FALSE(IsSpokenFeedbackEnabled());
 
   observer.reset();
   SetHighContrastEnabledPref(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
+            ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
   EXPECT_TRUE(IsHighContrastEnabled());
 
   observer.reset();
   SetHighContrastEnabledPref(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
+            ACCESSIBILITY_TOGGLE_HIGH_CONTRAST_MODE);
   EXPECT_FALSE(IsHighContrastEnabled());
 
   observer.reset();
   SetVirtualKeyboardEnabledPref(true);
   EXPECT_TRUE(observer.observed());
   EXPECT_TRUE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
+            ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
   EXPECT_TRUE(IsVirtualKeyboardEnabled());
 
   observer.reset();
   SetVirtualKeyboardEnabledPref(false);
   EXPECT_TRUE(observer.observed());
   EXPECT_FALSE(observer.observed_enabled());
   EXPECT_EQ(observer.observed_type(),
-            chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
+            ACCESSIBILITY_TOGGLE_VIRTUAL_KEYBOARD);
   EXPECT_FALSE(IsVirtualKeyboardEnabled());
 }
 
 class AccessibilityManagerUserTypeTest
     : public AccessibilityManagerTest,
       public ::testing::WithParamInterface<const char*> {
  protected:
   AccessibilityManagerUserTypeTest() {}
   virtual ~AccessibilityManagerUserTypeTest() {}
 
@@ skipping 93 matching lines @@
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 
   // Check on-screen keyboard.
   SetVirtualKeyboardEnabled(true);
   EXPECT_TRUE(ShouldShowAccessibilityMenu());
   SetVirtualKeyboardEnabled(false);
   EXPECT_FALSE(ShouldShowAccessibilityMenu());
 }
 
 }  // namespace chromeos