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

Unified Diff: components/policy/core/common/policy_loader_win_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
Index: components/policy/core/common/policy_loader_win_unittest.cc
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index 53a202ddfaf950f5d1e821d96daa2f897c44f287..1e06bd827cb0dea83ed74066336db5c751bcf869 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -72,24 +72,24 @@ bool InstallValue(const base::Value& value,
RegKey key(hive, path.c_str(), KEY_ALL_ACCESS);
EXPECT_TRUE(key.Valid());
switch (value.GetType()) {
- case base::Value::TYPE_NULL:
+ case base::Value::Type::NONE:
return key.WriteValue(name.c_str(), L"") == ERROR_SUCCESS;
- case base::Value::TYPE_BOOLEAN: {
+ case base::Value::Type::BOOLEAN: {
bool bool_value;
if (!value.GetAsBoolean(&bool_value))
return false;
return key.WriteValue(name.c_str(), bool_value ? 1 : 0) == ERROR_SUCCESS;
}
- case base::Value::TYPE_INTEGER: {
+ case base::Value::Type::INTEGER: {
int int_value;
if (!value.GetAsInteger(&int_value))
return false;
return key.WriteValue(name.c_str(), int_value) == ERROR_SUCCESS;
}
- case base::Value::TYPE_DOUBLE: {
+ case base::Value::Type::DOUBLE: {
double double_value;
if (!value.GetAsDouble(&double_value))
return false;
@@ -98,14 +98,14 @@ bool InstallValue(const base::Value& value,
return key.WriteValue(name.c_str(), str_value.c_str()) == ERROR_SUCCESS;
}
- case base::Value::TYPE_STRING: {
+ case base::Value::Type::STRING: {
base::string16 str_value;
if (!value.GetAsString(&str_value))
return false;
return key.WriteValue(name.c_str(), str_value.c_str()) == ERROR_SUCCESS;
}
- case base::Value::TYPE_DICTIONARY: {
+ case base::Value::Type::DICTIONARY: {
const base::DictionaryValue* sub_dict = NULL;
if (!value.GetAsDictionary(&sub_dict))
return false;
@@ -119,7 +119,7 @@ bool InstallValue(const base::Value& value,
return true;
}
- case base::Value::TYPE_LIST: {
+ case base::Value::Type::LIST: {
const base::ListValue* list = NULL;
if (!value.GetAsList(&list))
return false;
@@ -135,7 +135,7 @@ bool InstallValue(const base::Value& value,
return true;
}
- case base::Value::TYPE_BINARY:
+ case base::Value::Type::BINARY:
return false;
}
NOTREACHED();
@@ -624,31 +624,31 @@ void PRegTestHarness::AppendPolicyToPRegFile(const base::string16& path,
const std::string& key,
const base::Value* value) {
switch (value->GetType()) {
- case base::Value::TYPE_BOOLEAN: {
+ case base::Value::Type::BOOLEAN: {
bool boolean_value = false;
ASSERT_TRUE(value->GetAsBoolean(&boolean_value));
AppendDWORDToPRegFile(path, key, boolean_value);
break;
}
- case base::Value::TYPE_INTEGER: {
+ case base::Value::Type::INTEGER: {
int int_value = 0;
ASSERT_TRUE(value->GetAsInteger(&int_value));
AppendDWORDToPRegFile(path, key, int_value);
break;
}
- case base::Value::TYPE_DOUBLE: {
+ case base::Value::Type::DOUBLE: {
double double_value = 0;
ASSERT_TRUE(value->GetAsDouble(&double_value));
AppendStringToPRegFile(path, key, base::DoubleToString(double_value));
break;
}
- case base::Value::TYPE_STRING: {
+ case base::Value::Type::STRING: {
std::string string_value;
ASSERT_TRUE(value->GetAsString(&string_value));
AppendStringToPRegFile(path, key, string_value);
break;
}
- case base::Value::TYPE_DICTIONARY: {
+ case base::Value::Type::DICTIONARY: {
base::string16 subpath = path + kPathSep + UTF8ToUTF16(key);
const base::DictionaryValue* dict = NULL;
ASSERT_TRUE(value->GetAsDictionary(&dict));
@@ -658,7 +658,7 @@ void PRegTestHarness::AppendPolicyToPRegFile(const base::string16& path,
}
break;
}
- case base::Value::TYPE_LIST: {
+ case base::Value::Type::LIST: {
base::string16 subpath = path + kPathSep + UTF8ToUTF16(key);
const base::ListValue* list = NULL;
ASSERT_TRUE(value->GetAsList(&list));
@@ -669,8 +669,8 @@ void PRegTestHarness::AppendPolicyToPRegFile(const base::string16& path,
}
break;
}
- case base::Value::TYPE_BINARY:
- case base::Value::TYPE_NULL: {
+ case base::Value::Type::BINARY:
+ case base::Value::Type::NONE: {
ADD_FAILURE();
break;
}
« no previous file with comments | « components/policy/core/common/mac_util_unittest.cc ('k') | components/policy/core/common/policy_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698