Remove dependency on NotificationService for cros a11y settings.

chrome/browser/chromeos/accessibility/magnification_manager_browsertest.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 <string>
 
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 89 matching lines @@
   UserManager::Get()->UserLoggedIn(name, name, true);
   // To prepare a non-new profile for tests, we must ensure the profile
   // directory and the preference files are created, because that's what
   // Profile::IsNewProfile() checks. UserLoggedIn(), however, does not yet
   // create the profile directory until GetActiveUserProfile() is called.
   ProfileManager::GetActiveUserProfile();
 }
 
 }  // namespace
 
-class MagnificationManagerTest : public InProcessBrowserTest,
-                                 public content::NotificationObserver {
+class MagnificationManagerTest : public InProcessBrowserTest {
  protected:
   MagnificationManagerTest() : observed_(false),
                                observed_enabled_(false),
                                observed_type_(ash::kDefaultMagnifierType) {}
   virtual ~MagnificationManagerTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitchASCII(switches::kLoginProfile,
                                     TestingProfile::kTestUserProfileDir);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER,
-        content::NotificationService::AllSources());
+    AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
+    CHECK(accessibility_manager);
+    accessibility_subscription_ = accessibility_manager->RegisterCallback(
+        base::Bind(&MagnificationManagerTest::OnAccessibilityStatusChanged,
+                   base::Unretained(this)));
 
     // Set the login-screen profile.
     MagnificationManager::Get()->SetProfileForTest(
         ProfileManager::GetActiveUserProfile());
   }
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    switch (type) {
-      case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER: {
-        AccessibilityStatusEventDetails* accessibility_status =
-            content::Details<AccessibilityStatusEventDetails>(details).ptr();
+  virtual void TearDownOnMainThread() OVERRIDE {
+    accessibility_subscription_.reset();
+  }
 
-        observed_ = true;
-        observed_enabled_ = accessibility_status->enabled;
-        observed_type_ = accessibility_status->magnifier_type;
-        break;
-      }
+  void OnAccessibilityStatusChanged(
+      const AccessibilityStatusEventDetails& details) {
+    if (details.notification_type == ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFIER) {
+      observed_type_ = details.magnifier_type;
+      observed_enabled_ = details.enabled;
+      observed_ = true;
+    } else if (details.notification_type == ACCESSIBILITY_MANAGER_SHUTDOWN) {
+      accessibility_subscription_.reset();
     }
   }
 
   bool observed_;
   bool observed_enabled_;
   ash::MagnifierType observed_type_;
-  content::NotificationRegistrar registrar_;
+  scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
   DISALLOW_COPY_AND_ASSIGN(MagnificationManagerTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MagnificationManagerTest, PRE_LoginOffToOff) {
   // Create a new profile once, to run the test with non-new profile.
   PrepareNonNewProfile(kTestUserName);
 
   // Sets pref to explicitly disable the magnifier.
   SetScreenMagnifierEnabledPref(false);
 }
@@ skipping 335 matching lines @@
   // Enables full screen magnifier.
   SetMagnifierEnabled(true);
   EXPECT_TRUE(IsMagnifierEnabled());
   EXPECT_EQ(ash::MAGNIFIER_FULL, GetMagnifierType());
 
   // Confirms that the actual scale is set to the maximum scale.
   EXPECT_EQ(4.0, GetFullScreenMagnifierScale());
 }
 
 }  // namespace chromeos