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

Unified Diff: tools/json_schema_compiler/util.cc

Issue 851673003: Cleanup: Some simplifications in json_schema_compiler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_dart_tests
Patch Set: Drop ArrayBuffer change, keep other simplifications. Created 5 years, 11 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: tools/json_schema_compiler/util.cc
diff --git a/tools/json_schema_compiler/util.cc b/tools/json_schema_compiler/util.cc
index 2806cfcf0f923c268dc1d9dd284fbe67f136342f..e7754cc475809e0c951a3d270261e8c8a11776f5 100644
--- a/tools/json_schema_compiler/util.cc
+++ b/tools/json_schema_compiler/util.cc
@@ -9,36 +9,31 @@
namespace json_schema_compiler {
namespace util {
-bool GetItemFromList(const base::ListValue& from, int index, int* out) {
- return from.GetInteger(index, out);
+bool PopulateItem(const base::Value& from, int* out) {
+ return from.GetAsInteger(out);
}
-bool GetItemFromList(const base::ListValue& from, int index, bool* out) {
- return from.GetBoolean(index, out);
+bool PopulateItem(const base::Value& from, bool* out) {
+ return from.GetAsBoolean(out);
}
-bool GetItemFromList(const base::ListValue& from, int index, double* out) {
- return from.GetDouble(index, out);
+bool PopulateItem(const base::Value& from, double* out) {
+ return from.GetAsDouble(out);
}
-bool GetItemFromList(const base::ListValue& from, int index, std::string* out) {
- return from.GetString(index, out);
+bool PopulateItem(const base::Value& from, std::string* out) {
+ return from.GetAsString(out);
}
-bool GetItemFromList(const base::ListValue& from,
- int index,
- linked_ptr<base::Value>* out) {
- const base::Value* value = NULL;
- if (!from.Get(index, &value))
- return false;
- *out = make_linked_ptr(value->DeepCopy());
+bool PopulateItem(const base::Value& from, linked_ptr<base::Value>* out) {
+ *out = make_linked_ptr(from.DeepCopy());
return true;
}
-bool GetItemFromList(const base::ListValue& from, int index,
- linked_ptr<base::DictionaryValue>* out) {
+bool PopulateItem(const base::Value& from,
+ linked_ptr<base::DictionaryValue>* out) {
const base::DictionaryValue* dict = NULL;
- if (!from.GetDictionary(index, &dict))
+ if (!from.GetAsDictionary(&dict))
return false;
*out = make_linked_ptr(dict->DeepCopy());
return true;

Powered by Google App Engine
This is Rietveld 408576698