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

Unified Diff: chromeos/network/onc/onc_translator_shill_to_onc.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 | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_validator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 2e62462a6b6a2f9315381eb90101b115a8ddb699..72ee0d8b94fca8b4c8efd6a6d65dfa726e4f4700 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -32,7 +32,7 @@ namespace {
std::unique_ptr<base::Value> ConvertStringToValue(const std::string& str,
base::Value::Type type) {
std::unique_ptr<base::Value> value;
- if (type == base::Value::TYPE_STRING) {
+ if (type == base::Value::Type::STRING) {
value.reset(new base::StringValue(str));
} else {
value = base::JSONReader::Read(str);
@@ -672,10 +672,10 @@ void ShillToONCTranslator::TranslateAndAddListOfObjects(
const base::ListValue& list) {
const OncFieldSignature* field_signature =
GetFieldSignature(*onc_signature_, onc_field_name);
- if (field_signature->value_signature->onc_type != base::Value::TYPE_LIST) {
+ if (field_signature->value_signature->onc_type != base::Value::Type::LIST) {
LOG(ERROR) << "ONC Field name: '" << onc_field_name << "' has type '"
<< field_signature->value_signature->onc_type
- << "', expected: base::Value::TYPE_LIST: " << GetName();
+ << "', expected: base::Value::Type::LIST: " << GetName();
return;
}
DCHECK(field_signature->value_signature->onc_array_entry_signature);
« no previous file with comments | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698