Index: components/prefs/pref_service_unittest.cc |
diff --git a/components/prefs/pref_service_unittest.cc b/components/prefs/pref_service_unittest.cc |
index 373c01bcb3f3c2b37ef1966362f100936e61f12a..5229b97ee8fe339c980734af385805049b97fcbf 100644 |
--- a/components/prefs/pref_service_unittest.cc |
+++ b/components/prefs/pref_service_unittest.cc |
@@ -148,7 +148,7 @@ TEST(PrefServiceTest, GetValueChangedType) { |
ASSERT_TRUE(pref); |
const base::Value* value = pref->GetValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
int actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kTestValue, actual_int_value); |
@@ -168,7 +168,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetValue() returns the default value. |
const base::Value* value = pref->GetValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
int actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kDefaultValue, actual_int_value); |
@@ -183,7 +183,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetValue() returns the user-set value. |
value = pref->GetValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kUserValue, actual_int_value); |
@@ -199,7 +199,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetValue() returns the user-set value. |
value = pref->GetValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kUserValue, actual_int_value); |
@@ -207,7 +207,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetRecommendedValue() returns the recommended value. |
value = pref->GetRecommendedValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kRecommendedValue, actual_int_value); |
@@ -218,7 +218,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetValue() returns the recommended value. |
value = pref->GetValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kRecommendedValue, actual_int_value); |
@@ -226,7 +226,7 @@ TEST(PrefServiceTest, GetValueAndGetRecommendedValue) { |
// Check that GetRecommendedValue() returns the recommended value. |
value = pref->GetRecommendedValue(); |
ASSERT_TRUE(value); |
- EXPECT_EQ(base::Value::TYPE_INTEGER, value->GetType()); |
+ EXPECT_EQ(base::Value::Type::INTEGER, value->GetType()); |
actual_int_value = -1; |
EXPECT_TRUE(value->GetAsInteger(&actual_int_value)); |
EXPECT_EQ(kRecommendedValue, actual_int_value); |
@@ -321,7 +321,7 @@ TEST(PrefServiceTest, WriteablePrefStoreFlags) { |
SCOPED_TRACE("Currently testing pref with name: " + |
std::string(entry.pref_name)); |
- prefs->GetMutableUserPref(entry.pref_name, base::Value::TYPE_DICTIONARY); |
+ prefs->GetMutableUserPref(entry.pref_name, base::Value::Type::DICTIONARY); |
EXPECT_TRUE(flag_checker->last_write_flags_set()); |
EXPECT_EQ(entry.write_flags, flag_checker->GetLastFlagsAndClear()); |