Revert 176087

ash/test/test_shell_delegate.cc

Index: ash/test/test_shell_delegate.cc
===================================================================
--- ash/test/test_shell_delegate.cc	(revision 176100)
+++ ash/test/test_shell_delegate.cc	(working copy)
@@ -24,8 +24,7 @@
       session_started_(true),
       spoken_feedback_enabled_(false),
       high_contrast_enabled_(false),
-      screen_magnifier_enabled_(false),
-      screen_magnifier_type_(kDefaultMagnifierType),
+      screen_magnifier_type_(MAGNIFIER_OFF),
       user_logged_in_(true),
       can_lock_screen_(true),
       num_exit_requests_(0) {
@@ -125,18 +124,10 @@
   return high_contrast_enabled_;
 }
 
-void TestShellDelegate::SetMagnifierEnabled(bool enabled) {
-  screen_magnifier_enabled_ = enabled;
-}
-
-void TestShellDelegate::SetMagnifierType(MagnifierType type) {
+void TestShellDelegate::SetMagnifier(const MagnifierType type) {
   screen_magnifier_type_ = type;
 }
 
-bool TestShellDelegate::IsMagnifierEnabled() const {
-  return screen_magnifier_enabled_;
-}
-
 MagnifierType TestShellDelegate::GetMagnifierType() const {
   return screen_magnifier_type_;
 }