Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0

chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc

 // Copyright 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 <string>
 
-#include "ash/magnifier/magnifier_constants.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/chromeos/accessibility_types.h"
 
 namespace em = enterprise_management;
 
 namespace policy {
 
 namespace {
 
 const em::AccessibilitySettingsProto_ScreenMagnifierType kFullScreenMagnifier =
     em::AccessibilitySettingsProto_ScreenMagnifierType_SCREEN_MAGNIFIER_TYPE_FULL;
 
@@ skipping 278 matching lines @@
   proto.mutable_accessibility_settings()->
       set_login_screen_default_screen_magnifier_type(kFullScreenMagnifier);
   RefreshDevicePolicyAndWaitForPrefChange(
       prefs::kAccessibilityScreenMagnifierType);
 
   // Verify that the prefs which control the screen magnifier type have changed
   // to the policy-supplied default.
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
                                   base::FundamentalValue(true));
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
-                                  base::FundamentalValue(ash::MAGNIFIER_FULL));
+                                  base::FundamentalValue(ui::MAGNIFIER_FULL));
 
   // Verify that the full-screen magnifier is enabled.
   chromeos::MagnificationManager* magnification_manager =
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
-  EXPECT_EQ(ash::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
+  EXPECT_EQ(ui::MAGNIFIER_FULL, magnification_manager->GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyInSessionBrowsertest,
                        DeviceLoginScreenDefaultLargeCursorEnabled) {
   // Verifies that changing the default state of the large cursor accessibility
   // feature on the login screen through policy does not affect its state in a
   // session.
 
   // Enable the large cursor through device policy and wait for the change to
   // take effect.
@@ skipping 80 matching lines @@
   // Verify that the prefs which control the screen magnifier in the session are
   // unchanged.
   VerifyPrefFollowsDefault(prefs::kAccessibilityScreenMagnifierEnabled);
   VerifyPrefFollowsDefault(prefs::kAccessibilityScreenMagnifierType);
 
   // Verify that the screen magnifier is disabled.
   chromeos::MagnificationManager* magnification_manager =
       chromeos::MagnificationManager::Get();
   ASSERT_TRUE(magnification_manager);
   EXPECT_FALSE(magnification_manager->IsMagnifierEnabled());
-  EXPECT_EQ(ash::kDefaultMagnifierType,
+  EXPECT_EQ(ui::kDefaultMagnifierType,
             magnification_manager->GetMagnifierType());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginScreenDefaultPolicyLoginScreenBrowsertest,
                        DeviceLoginScreenDefaultVirtualKeyboardEnabled) {
   // Verifies that the default state of the on-screen keyboard accessibility
   // feature on the login screen can be controlled through device policy.
 
   // Enable the on-screen keyboard through device policy and wait for the change
   // to take effect.
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_accessibility_settings()->
       set_login_screen_default_virtual_keyboard_enabled(true);
   RefreshDevicePolicyAndWaitForPrefChange(
       prefs::kAccessibilityVirtualKeyboardEnabled);
 
   // Verify that the pref which controls the on-screen keyboard in the login
   // profile has changed to the policy-supplied default.
   VerifyPrefFollowsRecommendation(prefs::kAccessibilityVirtualKeyboardEnabled,
                                   base::FundamentalValue(true));
 
   // Verify that the on-screen keyboard is enabled.
   chromeos::AccessibilityManager* accessibility_manager =
       chromeos::AccessibilityManager::Get();
   ASSERT_TRUE(accessibility_manager);
   EXPECT_TRUE(accessibility_manager->IsVirtualKeyboardEnabled());
 }
 
 } // namespace policy