| Index: chrome/browser/chromeos/settings/cros_settings_unittest.cc
|
| diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc
|
| index 8538aa38e586513f4f53e49995672efefd0c7f30..52810636025970127c459e2beb5eb332fb9c654d 100644
|
| --- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc
|
| +++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc
|
| @@ -104,8 +104,7 @@ class CrosSettingsTest : public testing::Test {
|
|
|
| TEST_F(CrosSettingsTest, SetPref) {
|
| // Change to something that is not the default.
|
| - AddExpectation(kAccountsPrefAllowGuest,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + AddExpectation(kAccountsPrefAllowGuest, base::MakeUnique<base::Value>(false));
|
| SetPref(kAccountsPrefAllowGuest,
|
| expected_props_[kAccountsPrefAllowGuest].get());
|
| FetchPref(kAccountsPrefAllowGuest);
|
| @@ -114,8 +113,7 @@ TEST_F(CrosSettingsTest, SetPref) {
|
|
|
| TEST_F(CrosSettingsTest, GetPref) {
|
| // We didn't change the default so look for it.
|
| - AddExpectation(kAccountsPrefAllowGuest,
|
| - base::MakeUnique<base::FundamentalValue>(true));
|
| + AddExpectation(kAccountsPrefAllowGuest, base::MakeUnique<base::Value>(true));
|
| FetchPref(kAccountsPrefAllowGuest);
|
| }
|
|
|
| @@ -125,7 +123,7 @@ TEST_F(CrosSettingsTest, SetWhitelist) {
|
| base::ListValue whitelist;
|
| whitelist.AppendString("me@owner");
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + base::MakeUnique<base::Value>(false));
|
| AddExpectation(kAccountsPrefUsers, whitelist.CreateDeepCopy());
|
| SetPref(kAccountsPrefUsers, &whitelist);
|
| FetchPref(kAccountsPrefAllowNewUser);
|
| @@ -138,7 +136,7 @@ TEST_F(CrosSettingsTest, SetWhitelistWithListOps) {
|
| base::StringValue hacky_user("h@xxor");
|
| whitelist->Append(hacky_user.CreateDeepCopy());
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + base::MakeUnique<base::Value>(false));
|
| AddExpectation(kAccountsPrefUsers, std::move(whitelist));
|
| // Add some user to the whitelist.
|
| settings_.AppendToList(kAccountsPrefUsers, &hacky_user);
|
| @@ -154,7 +152,7 @@ TEST_F(CrosSettingsTest, SetWhitelistWithListOps2) {
|
| std::unique_ptr<base::ListValue> expected_list = whitelist.CreateDeepCopy();
|
| whitelist.Append(lamy_user.CreateDeepCopy());
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + base::MakeUnique<base::Value>(false));
|
| AddExpectation(kAccountsPrefUsers, whitelist.CreateDeepCopy());
|
| SetPref(kAccountsPrefUsers, &whitelist);
|
| FetchPref(kAccountsPrefAllowNewUser);
|
| @@ -172,7 +170,7 @@ TEST_F(CrosSettingsTest, SetEmptyWhitelist) {
|
| // kAccountsPrefAllowNewUser to true.
|
| base::ListValue whitelist;
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(true));
|
| + base::MakeUnique<base::Value>(true));
|
| SetPref(kAccountsPrefUsers, &whitelist);
|
| FetchPref(kAccountsPrefAllowNewUser);
|
| FetchPref(kAccountsPrefUsers);
|
| @@ -182,10 +180,10 @@ TEST_F(CrosSettingsTest, SetEmptyWhitelistAndNoNewUsers) {
|
| // Setting the whitelist empty and disallowing new users should result in no
|
| // new users allowed.
|
| base::ListValue whitelist;
|
| - base::FundamentalValue disallow_new(false);
|
| + base::Value disallow_new(false);
|
| AddExpectation(kAccountsPrefUsers, whitelist.CreateDeepCopy());
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + base::MakeUnique<base::Value>(false));
|
| SetPref(kAccountsPrefUsers, &whitelist);
|
| SetPref(kAccountsPrefAllowNewUser, &disallow_new);
|
| FetchPref(kAccountsPrefAllowNewUser);
|
| @@ -199,7 +197,7 @@ TEST_F(CrosSettingsTest, SetWhitelistAndNoNewUsers) {
|
| whitelist.AppendString("me@owner");
|
| AddExpectation(kAccountsPrefUsers, whitelist.CreateDeepCopy());
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(false));
|
| + base::MakeUnique<base::Value>(false));
|
| SetPref(kAccountsPrefUsers, &whitelist);
|
| SetPref(kAccountsPrefAllowNewUser,
|
| expected_props_[kAccountsPrefAllowNewUser].get());
|
| @@ -210,16 +208,16 @@ TEST_F(CrosSettingsTest, SetWhitelistAndNoNewUsers) {
|
| TEST_F(CrosSettingsTest, SetAllowNewUsers) {
|
| // Setting kAccountsPrefAllowNewUser to true with no whitelist should be ok.
|
| AddExpectation(kAccountsPrefAllowNewUser,
|
| - base::MakeUnique<base::FundamentalValue>(true));
|
| + base::MakeUnique<base::Value>(true));
|
| SetPref(kAccountsPrefAllowNewUser,
|
| expected_props_[kAccountsPrefAllowNewUser].get());
|
| FetchPref(kAccountsPrefAllowNewUser);
|
| }
|
|
|
| TEST_F(CrosSettingsTest, SetEphemeralUsersEnabled) {
|
| - base::FundamentalValue ephemeral_users_enabled(true);
|
| + base::Value ephemeral_users_enabled(true);
|
| AddExpectation(kAccountsPrefEphemeralUsersEnabled,
|
| - base::MakeUnique<base::FundamentalValue>(true));
|
| + base::MakeUnique<base::Value>(true));
|
| SetPref(kAccountsPrefEphemeralUsersEnabled, &ephemeral_users_enabled);
|
| FetchPref(kAccountsPrefEphemeralUsersEnabled);
|
| }
|
|
|