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

Unified Diff: components/prefs/pref_value_store_unittest.cc

Issue 2539363004: Make base::Value::TYPE a scoped enum. (Closed)
Patch Set: Rebase Created 4 years 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
« no previous file with comments | « components/prefs/pref_service_unittest.cc ('k') | components/prefs/scoped_user_pref_update.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/prefs/pref_value_store_unittest.cc
diff --git a/components/prefs/pref_value_store_unittest.cc b/components/prefs/pref_value_store_unittest.cc
index b1656a427bbc6bb31b98c87b74f97d2bbe26b539..23fc686e17cee530644ff0e62f7fc1a579c26837 100644
--- a/components/prefs/pref_value_store_unittest.cc
+++ b/components/prefs/pref_value_store_unittest.cc
@@ -271,7 +271,7 @@ TEST_F(PrefValueStoreTest, GetValue) {
// Test getting a managed value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kManagedPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
std::string actual_str_value;
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(managed_pref::kManagedValue, actual_str_value);
@@ -279,35 +279,35 @@ TEST_F(PrefValueStoreTest, GetValue) {
// Test getting a supervised user value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kSupervisedUserPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(supervised_user_pref::kSupervisedUserValue, actual_str_value);
// Test getting an extension value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kExtensionPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(extension_pref::kExtensionValue, actual_str_value);
// Test getting a command-line value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kCommandLinePref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(command_line_pref::kCommandLineValue, actual_str_value);
// Test getting a user-set value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kUserPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(user_pref::kUserValue, actual_str_value);
// Test getting a user set value overwriting a recommended value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kRecommendedPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kRecommendedValue,
actual_str_value);
@@ -315,7 +315,7 @@ TEST_F(PrefValueStoreTest, GetValue) {
// Test getting a default value.
value = NULL;
ASSERT_TRUE(pref_value_store_->GetValue(prefs::kDefaultPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(default_pref::kDefaultValue, actual_str_value);
@@ -324,7 +324,7 @@ TEST_F(PrefValueStoreTest, GetValue) {
base::FundamentalValue tmp_dummy_value(true);
value = &tmp_dummy_value;
ASSERT_FALSE(pref_value_store_->GetValue(prefs::kMissingPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
ASSERT_FALSE(value);
}
@@ -339,7 +339,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kManagedPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
std::string actual_str_value;
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kManagedValue, actual_str_value);
@@ -348,7 +348,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kSupervisedUserPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kSupervisedUserValue, actual_str_value);
@@ -356,7 +356,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kExtensionPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kExtensionValue, actual_str_value);
@@ -364,7 +364,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kCommandLinePref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kCommandLineValue, actual_str_value);
@@ -372,7 +372,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kUserPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kUserValue, actual_str_value);
@@ -380,7 +380,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = NULL;
ASSERT_TRUE(pref_value_store_->GetRecommendedValue(
prefs::kRecommendedPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
EXPECT_TRUE(value->GetAsString(&actual_str_value));
EXPECT_EQ(recommended_pref::kRecommendedValue,
actual_str_value);
@@ -390,7 +390,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = &tmp_dummy_value;
ASSERT_FALSE(pref_value_store_->GetRecommendedValue(
prefs::kDefaultPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
ASSERT_FALSE(value);
// Test getting a preference value that the |PrefValueStore|
@@ -398,7 +398,7 @@ TEST_F(PrefValueStoreTest, GetRecommendedValue) {
value = &tmp_dummy_value;
ASSERT_FALSE(pref_value_store_->GetRecommendedValue(
prefs::kMissingPref,
- base::Value::TYPE_STRING, &value));
+ base::Value::Type::STRING, &value));
ASSERT_FALSE(value);
}
« no previous file with comments | « components/prefs/pref_service_unittest.cc ('k') | components/prefs/scoped_user_pref_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698