Revert 176087

chrome/browser/chromeos/system/tray_accessibility_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 "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_views.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/login_status.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
-void SetMagnifierEnabled(bool enabled) {
-  MagnificationManager::Get()->SetMagnifierEnabled(enabled);
+namespace {
+  ui::MouseEvent& dummyEvent = *((ui::MouseEvent*)0);
 }
 
 class TrayAccessibilityTest : public CrosInProcessBrowserTest {
  protected:
   TrayAccessibilityTest() {}
   virtual ~TrayAccessibilityTest() {}
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kLoginManager);
     command_line->AppendSwitchASCII(switches::kLoginProfile,
                                     TestingProfile::kTestUserProfileDir);
@@ skipping 98 matching lines @@
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Toggling high contrast the visibillity of the icon.
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
   accessibility::EnableHighContrast(false);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Toggling magnifier the visibillity of the icon.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(IsTrayIconVisible());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Enabling all accessibility features.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(IsTrayIconVisible());
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(IsTrayIconVisible());
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(IsTrayIconVisible());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(IsTrayIconVisible());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_FALSE(IsTrayIconVisible());
 
   // Confirms that prefs::kShouldAlwaysShowAccessibilityMenu doesn't affect
   // the icon on the tray.
   Profile* profile = ProfileManager::GetDefaultProfile();
   PrefService* prefs = profile->GetPrefs();
   prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, true);
   prefs->CommitPendingWrite();
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(IsTrayIconVisible());
@@ skipping 21 matching lines @@
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Toggling high contrast changes the visibillity of the menu.
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Toggling screen magnifier changes the visibillity of the menu.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_FALSE(CanCreateMenuItem());
 
   // Enabling all accessibility features.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_FALSE(CanCreateMenuItem());
 }
 
 IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, ShowMenuWithShowMenuOption) {
   // Login
   UserManager::Get()->UserLoggedIn("owner@invalid.domain", true);
   UserManager::Get()->SessionStarted();
 
   // Sets prefs::kShouldAlwaysShowAccessibilityMenu = true.
   Profile* profile = ProfileManager::GetDefaultProfile();
@@ skipping 10 matching lines @@
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling high contrast.
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling screen magnifier.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Enabling all accessibility features.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Sets prefs::kShouldAlwaysShowAccessibilityMenu = true.
   prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, false);
 
   // Confirms that the menu is invisible.
   EXPECT_FALSE(CanCreateMenuItem());
 }
 
 IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
   SetLoginStatus(ash::user::LOGGED_IN_NONE);
 
   // Confirms that the menu is visible.
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling spoken feedback.
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling high contrast.
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // The menu is keeping visible regardless of toggling screen magnifier.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Enabling all accessibility features.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(true);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   EXPECT_TRUE(CanCreateMenuItem());
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CanCreateMenuItem());
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CanCreateMenuItem());
 
   // Sets prefs::kShouldAlwaysShowAccessibilityMenu = true.
   Profile* profile = ProfileManager::GetDefaultProfile();
   PrefService* prefs = profile->GetPrefs();
   prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, true);
   prefs->CommitPendingWrite();
 
   // Confirms that the menu is keeping visible.
   EXPECT_TRUE(CanCreateMenuItem());
@@ skipping 25 matching lines @@
   ClickHighContrastOnDetailMenu();
   EXPECT_TRUE(accessibility::IsHighContrastEnabled());
 
   EXPECT_TRUE(CreateDetailedMenu());
   ClickHighContrastOnDetailMenu();
   EXPECT_FALSE(accessibility::IsHighContrastEnabled());
 
   // Confirms that the check item toggles the magnifier.
   EXPECT_FALSE(accessibility::IsHighContrastEnabled());
 
-  EXPECT_FALSE(MagnificationManager::Get()->IsMagnifierEnabled());
+  EXPECT_EQ(ash::MAGNIFIER_OFF,
+            MagnificationManager::Get()->GetMagnifierType());
   EXPECT_TRUE(CreateDetailedMenu());
   ClickScreenMagnifierOnDetailMenu();
-  EXPECT_TRUE(MagnificationManager::Get()->IsMagnifierEnabled());
+  EXPECT_EQ(ash::MAGNIFIER_FULL,
+            MagnificationManager::Get()->GetMagnifierType());
 
   EXPECT_TRUE(CreateDetailedMenu());
   ClickScreenMagnifierOnDetailMenu();
-  EXPECT_FALSE(MagnificationManager::Get()->IsMagnifierEnabled());
+  EXPECT_EQ(ash::MAGNIFIER_OFF,
+            MagnificationManager::Get()->GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(TrayAccessibilityTest, CheckMarksOnDetailMenu) {
   // At first, all of the check is unchecked.
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 
@@ skipping 23 matching lines @@
 
   // Disabling high contrast.
   accessibility::EnableHighContrast(false);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Enabling full screen magnifier.
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Disabling screen magnifier.
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Enabling all of the a11y features.
   accessibility::EnableSpokenFeedback(true, NULL, ash::A11Y_NOTIFICATION_NONE);
   accessibility::EnableHighContrast(true);
-  SetMagnifierEnabled(true);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_FULL);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_TRUE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_TRUE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_TRUE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 
   // Disabling all of the a11y features.
   accessibility::EnableSpokenFeedback(false, NULL, ash::A11Y_NOTIFICATION_NONE);
   accessibility::EnableHighContrast(false);
-  SetMagnifierEnabled(false);
+  MagnificationManager::Get()->SetMagnifier(ash::MAGNIFIER_OFF);
   EXPECT_TRUE(CreateDetailedMenu());
   EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());
   EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());
   EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());
   CloseDetailMenu();
 }
 
 }  // namespace chromeos