Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

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

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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
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 a6828be0ec709db795ae25c4d7b904feed5de00a..34975c6ab7f59300806a0f1a38bb739fafe06d66 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -185,17 +185,17 @@ void RecommendationRestorerTest::VerifyPrefFollowsUser(
void RecommendationRestorerTest::VerifyPrefsFollowUser() const {
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(ash::MAGNIFIER_FULL));
+ base::Value(ash::MAGNIFIER_FULL));
VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
}
void RecommendationRestorerTest::VerifyPrefFollowsRecommendation(
@@ -213,17 +213,17 @@ void RecommendationRestorerTest::VerifyPrefFollowsRecommendation(
void RecommendationRestorerTest::VerifyPrefsFollowRecommendations() const {
VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(0));
+ base::Value(0));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
}
void RecommendationRestorerTest::VerifyNotListeningForNotifications() const {
@@ -297,55 +297,55 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeOnLoginScreen) {
recommended_prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled,
false);
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
recommended_prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled,
false);
VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
recommended_prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled,
false);
VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled,
false);
recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0);
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(ash::MAGNIFIER_FULL));
+ base::Value(ash::MAGNIFIER_FULL));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(0));
+ base::Value(0));
VerifyTimerIsStopped();
recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled,
false);
VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
}
@@ -359,49 +359,49 @@ TEST_F(RecommendationRestorerTest, RestoreOnRecommendationChangeInUserSession) {
NotifyOfSessionStart();
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
recommended_prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled,
false);
VerifyTimerIsStopped();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
recommended_prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled,
false);
VerifyTimerIsStopped();
VerifyPrefFollowsRecommendation(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
recommended_prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled,
false);
VerifyTimerIsStopped();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(ash::MAGNIFIER_FULL));
+ base::Value(ash::MAGNIFIER_FULL));
recommended_prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled,
false);
recommended_prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType, 0);
VerifyTimerIsStopped();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(0));
+ base::Value(0));
VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
recommended_prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled,
false);
VerifyTimerIsStopped();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
}
TEST_F(RecommendationRestorerTest, DoNothingOnUserChange) {
@@ -413,36 +413,36 @@ TEST_F(RecommendationRestorerTest, DoNothingOnUserChange) {
prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,
ash::MAGNIFIER_FULL);
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(ash::MAGNIFIER_FULL));
+ base::Value(ash::MAGNIFIER_FULL));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsStopped();
}
@@ -458,53 +458,53 @@ TEST_F(RecommendationRestorerTest, RestoreOnUserChange) {
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityLargeCursorEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilitySpokenFeedbackEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilitySpokenFeedbackEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityHighContrastEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityHighContrastEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityScreenMagnifierEnabled, true);
prefs_->SetInteger(prefs::kAccessibilityScreenMagnifierType,
ash::MAGNIFIER_FULL);
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyPrefFollowsUser(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(ash::MAGNIFIER_FULL));
+ base::Value(ash::MAGNIFIER_FULL));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyPrefFollowsRecommendation(prefs::kAccessibilityScreenMagnifierType,
- base::FundamentalValue(0));
+ base::Value(0));
VerifyTimerIsStopped();
prefs_->SetBoolean(prefs::kAccessibilityVirtualKeyboardEnabled, true);
VerifyPrefFollowsUser(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityVirtualKeyboardEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
}
@@ -555,13 +555,13 @@ TEST_F(RecommendationRestorerTest, UserActivityResetsTimer) {
NotifyOfUserActivity();
runner_->RunPendingTasks();
VerifyPrefFollowsUser(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(true));
+ base::Value(true));
// Fast forward until the reset timer fires.
VerifyTimerIsRunning();
runner_->RunUntilIdle();
VerifyPrefFollowsRecommendation(prefs::kAccessibilityLargeCursorEnabled,
- base::FundamentalValue(false));
+ base::Value(false));
VerifyTimerIsStopped();
}

Powered by Google App Engine
This is Rietveld 408576698