Fix some instances of -Wshadow.
Bug: 794619
Change-Id: I5eb6a4ac0072e61c7638e6cacd402a86bb1a9354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3152198
Auto-Submit: Peter Kasting <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Commit-Queue: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/main@{#922539}
diff --git a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
index 0fe41ca..266c9a4 100644
--- a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
@@ -19,17 +19,17 @@
};
TEST_F(IncognitoModePrefsTest, IntToAvailability) {
- ASSERT_EQ(0, IncognitoModePrefs::ENABLED);
- ASSERT_EQ(1, IncognitoModePrefs::DISABLED);
- ASSERT_EQ(2, IncognitoModePrefs::FORCED);
+ ASSERT_EQ(0, static_cast<int>(IncognitoModePrefs::Availability::kEnabled));
+ ASSERT_EQ(1, static_cast<int>(IncognitoModePrefs::Availability::kDisabled));
+ ASSERT_EQ(2, static_cast<int>(IncognitoModePrefs::Availability::kForced));
IncognitoModePrefs::Availability incognito;
EXPECT_TRUE(IncognitoModePrefs::IntToAvailability(0, &incognito));
- EXPECT_EQ(IncognitoModePrefs::ENABLED, incognito);
+ EXPECT_EQ(IncognitoModePrefs::Availability::kEnabled, incognito);
EXPECT_TRUE(IncognitoModePrefs::IntToAvailability(1, &incognito));
- EXPECT_EQ(IncognitoModePrefs::DISABLED, incognito);
+ EXPECT_EQ(IncognitoModePrefs::Availability::kDisabled, incognito);
EXPECT_TRUE(IncognitoModePrefs::IntToAvailability(2, &incognito));
- EXPECT_EQ(IncognitoModePrefs::FORCED, incognito);
+ EXPECT_EQ(IncognitoModePrefs::Availability::kForced, incognito);
EXPECT_FALSE(IncognitoModePrefs::IntToAvailability(10, &incognito));
EXPECT_EQ(IncognitoModePrefs::kDefaultAvailability, incognito);
@@ -38,21 +38,22 @@
}
TEST_F(IncognitoModePrefsTest, GetAvailability) {
- prefs_.SetUserPref(
- prefs::kIncognitoModeAvailability,
- std::make_unique<base::Value>(IncognitoModePrefs::ENABLED));
- EXPECT_EQ(IncognitoModePrefs::ENABLED,
- IncognitoModePrefs::GetAvailability(&prefs_));
-
- prefs_.SetUserPref(
- prefs::kIncognitoModeAvailability,
- std::make_unique<base::Value>(IncognitoModePrefs::DISABLED));
- EXPECT_EQ(IncognitoModePrefs::DISABLED,
+ prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
+ std::make_unique<base::Value>(static_cast<int>(
+ IncognitoModePrefs::Availability::kEnabled)));
+ EXPECT_EQ(IncognitoModePrefs::Availability::kEnabled,
IncognitoModePrefs::GetAvailability(&prefs_));
prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
- std::make_unique<base::Value>(IncognitoModePrefs::FORCED));
- EXPECT_EQ(IncognitoModePrefs::FORCED,
+ std::make_unique<base::Value>(static_cast<int>(
+ IncognitoModePrefs::Availability::kDisabled)));
+ EXPECT_EQ(IncognitoModePrefs::Availability::kDisabled,
+ IncognitoModePrefs::GetAvailability(&prefs_));
+
+ prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
+ std::make_unique<base::Value>(static_cast<int>(
+ IncognitoModePrefs::Availability::kForced)));
+ EXPECT_EQ(IncognitoModePrefs::Availability::kForced,
IncognitoModePrefs::GetAvailability(&prefs_));
}
@@ -64,6 +65,6 @@
EXPECT_DCHECK_DEATH({
IncognitoModePrefs::Availability availability =
IncognitoModePrefs::GetAvailability(&prefs_);
- EXPECT_EQ(IncognitoModePrefs::ENABLED, availability);
+ EXPECT_EQ(IncognitoModePrefs::Availability::kEnabled, availability);
});
}
