chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc - Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace

Unified Diff: chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y

Patch Set: fix chromevox code generated from js Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/login_screen_default_policy_browsertest.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc

diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc

index 42d942308d20c5c2164a2960ed3cc804f465eb1b..b7362d8a211b9da029df8041ecdd3bc09b37352f 100644

--- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc

+++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc

@@ -131,7 +131,7 @@ void RecommendationRestorerTest::SetUserSettings() {

prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true);

prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);

prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,

- ui::MAGNIFIER_FULL);

+ ash::MAGNIFIER_FULL);

prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);

}

@@ -188,7 +188,7 @@ void RecommendationRestorerTest::VerifyPrefsFollowUser() const {

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ui::MAGNIFIER_FULL));

+ base::FundamentalValue(ash::MAGNIFIER_FULL));

VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,

base::FundamentalValue(true));

}

@@ -325,7 +325,7 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeOnLoginScreen) {

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ui::MAGNIFIER_FULL));

+ base::FundamentalValue(ash::MAGNIFIER_FULL));

VerifyTimerIsRunning();

runner_->RunUntilIdle();

VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,

@@ -380,7 +380,7 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeInUserSession) {

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ui::MAGNIFIER_FULL));

+ base::FundamentalValue(ash::MAGNIFIER_FULL));

recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled,

false);

recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0);

@@ -428,11 +428,11 @@ TEST_F(RecommendationRestorerTest, DoNothingOnUserChange) {

prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);

prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,

- ui::MAGNIFIER_FULL);

+ ash::MAGNIFIER_FULL);

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ui::MAGNIFIER_FULL));

+ base::FundamentalValue(ash::MAGNIFIER_FULL));

VerifyTimerIsStopped();

prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);

@@ -480,11 +480,11 @@ TEST_F(RecommendationRestorerTest, RestoreOnUserChange) {

VerifyTimerIsStopped();

prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);

prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,

- ui::MAGNIFIER_FULL);

+ ash::MAGNIFIER_FULL);

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,

base::FundamentalValue(true));

VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,

- base::FundamentalValue(ui::MAGNIFIER_FULL));

+ base::FundamentalValue(ash::MAGNIFIER_FULL));

VerifyTimerIsRunning();

runner_->RunUntilIdle();

VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,