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

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
index f26bf46d31fe78d057427d24ca431b0343594f70..dbb622ca6af06bce953b10bd1fed39c8f77a99a1 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
@@ -83,7 +83,7 @@ bool FindInListValue(const std::string& needle, const base::Value* haystack) {
const base::ListValue* list;
if (!haystack->GetAsList(&list))
return false;
- return list->end() != list->Find(base::StringValue(needle));
+ return list->end() != list->Find(base::Value(needle));
}
} // namespace
@@ -144,14 +144,14 @@ class OwnerSettingsServiceChromeOSTest : public DeviceSettingsTestBase {
};
TEST_F(OwnerSettingsServiceChromeOSTest, SingleSetTest) {
- TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
- TestSingleSet(service_, kReleaseChannel, base::StringValue("beta-channel"));
- TestSingleSet(service_, kReleaseChannel, base::StringValue("stable-channel"));
+ TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
+ TestSingleSet(service_, kReleaseChannel, base::Value("beta-channel"));
+ TestSingleSet(service_, kReleaseChannel, base::Value("stable-channel"));
}
TEST_F(OwnerSettingsServiceChromeOSTest, MultipleSetTest) {
base::Value allow_guest(false);
- base::StringValue release_channel("stable-channel");
+ base::Value release_channel("stable-channel");
base::Value show_user_names(true);
PrefsChecker checker(service_, provider_.get());
@@ -172,7 +172,7 @@ TEST_F(OwnerSettingsServiceChromeOSTest, FailedSetRequest) {
// Check that DeviceSettingsProvider's cache is updated.
PrefsChecker checker(service_, provider_.get());
- checker.Set(kReleaseChannel, base::StringValue("stable-channel"));
+ checker.Set(kReleaseChannel, base::Value("stable-channel"));
FlushDeviceSettings();
checker.Wait();
@@ -186,7 +186,7 @@ TEST_F(OwnerSettingsServiceChromeOSTest, ForceWhitelist) {
EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
provider_->Get(kAccountsPrefUsers)));
// Force a settings write.
- TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
+ TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
provider_->Get(kAccountsPrefUsers)));
}

Powered by Google App Engine
This is Rietveld 408576698