Commit df7c2295 authored by Bailey Berro's avatar Bailey Berro Committed by Commit Bot

Remove uninclusive language in printing code

Bug: 1123074
Change-Id: I3cc11088dd8ae2e17e1a6f6f6c3a083a3ffe8e3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2382218
Auto-Submit: Bailey Berro <baileyberro@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802783}
parent c6015b2a
...@@ -22,8 +22,8 @@ namespace { ...@@ -22,8 +22,8 @@ namespace {
constexpr size_t kNumPrinters = 5; constexpr size_t kNumPrinters = 5;
constexpr size_t kWhitelistPrinters = 4; constexpr size_t kAllowlistPrinters = 4;
constexpr std::array<const char*, kWhitelistPrinters> kWhitelistIds = { constexpr std::array<const char*, kAllowlistPrinters> kAllowlistIds = {
"First", "Second", "Third", "Fifth"}; "First", "Second", "Third", "Fifth"};
constexpr std::array<const char*, 3> kBlocklistIds = {"Second", "Third", constexpr std::array<const char*, 3> kBlocklistIds = {"Second", "Third",
...@@ -155,7 +155,7 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsAllAccess) { ...@@ -155,7 +155,7 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsAllAccess) {
EXPECT_EQ(calculator->GetPrinters().size(), kNumPrinters); EXPECT_EQ(calculator->GetPrinters().size(), kNumPrinters);
} }
TEST_F(CalculatorsPoliciesBinderTest, PrefsWhitelist) { TEST_F(CalculatorsPoliciesBinderTest, PrefsAllowlist) {
auto calculator = UserCalculator(); auto calculator = UserCalculator();
// Set prefs to complete computation // Set prefs to complete computation
...@@ -164,11 +164,11 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsWhitelist) { ...@@ -164,11 +164,11 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsWhitelist) {
std::make_unique<base::Value>( std::make_unique<base::Value>(
BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY)); BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY));
prefs_.SetManagedPref(prefs::kRecommendedPrintersAllowlist, prefs_.SetManagedPref(prefs::kRecommendedPrintersAllowlist,
StringsToList(kWhitelistIds)); StringsToList(kAllowlistIds));
env_.RunUntilIdle(); env_.RunUntilIdle();
EXPECT_TRUE(calculator->IsComplete()); EXPECT_TRUE(calculator->IsComplete());
EXPECT_EQ(calculator->GetPrinters().size(), kWhitelistPrinters); EXPECT_EQ(calculator->GetPrinters().size(), kAllowlistPrinters);
} }
TEST_F(CalculatorsPoliciesBinderTest, PrefsBlocklist) { TEST_F(CalculatorsPoliciesBinderTest, PrefsBlocklist) {
...@@ -195,13 +195,13 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsBeforeBind) { ...@@ -195,13 +195,13 @@ TEST_F(CalculatorsPoliciesBinderTest, PrefsBeforeBind) {
std::make_unique<base::Value>( std::make_unique<base::Value>(
BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY)); BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY));
prefs_.SetManagedPref(prefs::kRecommendedPrintersAllowlist, prefs_.SetManagedPref(prefs::kRecommendedPrintersAllowlist,
StringsToList(kWhitelistIds)); StringsToList(kAllowlistIds));
auto calculator = UserCalculator(); auto calculator = UserCalculator();
env_.RunUntilIdle(); env_.RunUntilIdle();
EXPECT_TRUE(calculator->IsComplete()); EXPECT_TRUE(calculator->IsComplete());
EXPECT_EQ(calculator->GetPrinters().size(), kWhitelistPrinters); EXPECT_EQ(calculator->GetPrinters().size(), kAllowlistPrinters);
} }
TEST_F(CalculatorsPoliciesBinderTest, SettingsAllAccess) { TEST_F(CalculatorsPoliciesBinderTest, SettingsAllAccess) {
...@@ -215,17 +215,17 @@ TEST_F(CalculatorsPoliciesBinderTest, SettingsAllAccess) { ...@@ -215,17 +215,17 @@ TEST_F(CalculatorsPoliciesBinderTest, SettingsAllAccess) {
EXPECT_EQ(calculator->GetPrinters().size(), kNumPrinters); EXPECT_EQ(calculator->GetPrinters().size(), kNumPrinters);
} }
TEST_F(CalculatorsPoliciesBinderTest, SettingsWhitelist) { TEST_F(CalculatorsPoliciesBinderTest, SettingsAllowlist) {
auto calculator = DeviceCalculator(); auto calculator = DeviceCalculator();
SetDeviceSetting( SetDeviceSetting(
kDevicePrintersAccessMode, kDevicePrintersAccessMode,
base::Value(BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY)); base::Value(BulkPrintersCalculator::AccessMode::ALLOWLIST_ONLY));
SetDeviceSetting(kDevicePrintersAllowlist, *StringsToList(kWhitelistIds)); SetDeviceSetting(kDevicePrintersAllowlist, *StringsToList(kAllowlistIds));
env_.RunUntilIdle(); env_.RunUntilIdle();
EXPECT_TRUE(calculator->IsComplete()); EXPECT_TRUE(calculator->IsComplete());
EXPECT_EQ(calculator->GetPrinters().size(), kWhitelistPrinters); EXPECT_EQ(calculator->GetPrinters().size(), kAllowlistPrinters);
} }
TEST_F(CalculatorsPoliciesBinderTest, SettingsBlocklist) { TEST_F(CalculatorsPoliciesBinderTest, SettingsBlocklist) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment