Revert 176087

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <algorithm>
 
 #include "ash/caps_lock_delegate_stub.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/window_util.h"
 #include "content/public/test/test_browser_context.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate()
     : locked_(false),
       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) {
 }
 
 TestShellDelegate::~TestShellDelegate() {
 }
 
 bool TestShellDelegate::IsUserLoggedIn() const {
   return user_logged_in_;
@@ skipping 79 matching lines @@
 }
 
 void TestShellDelegate::ToggleHighContrast() {
   high_contrast_enabled_ = !high_contrast_enabled_;
 }
 
 bool TestShellDelegate::IsHighContrastEnabled() const {
   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_;
 }
 
 bool TestShellDelegate::ShouldAlwaysShowAccessibilityMenu() const {
   return false;
 }
 
 app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
   return NULL;
@@ skipping 73 matching lines @@
   if (!user_logged_in)
     session_started_ = false;
 }
 
 void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) {
   can_lock_screen_ = can_lock_screen;
 }
 
 }  // namespace test
 }  // namespace ash