Switch various ValueTypeToString()s to base::Value::GetTypeName().

tools/json_schema_compiler/util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/json_schema_compiler/util.h"
 
+#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 
 namespace json_schema_compiler {
 namespace util {
 
+namespace {
+
+bool ReportError(const base::Value& from,
+                 base::Value::Type expected,
+                 base::string16* error) {
+  if (!error->empty())
+    error->append(base::ASCIIToUTF16("; "));
+  error->append(base::ASCIIToUTF16(base::StringPrintf(
+      "expected %s, got %s", base::Value::GetTypeName(expected),
+      base::Value::GetTypeName(from.GetType()))));
+  return false;  // Always false on purpose.
+}
+
+}  // namespace
+
 bool PopulateItem(const base::Value& from, int* out) {
   return from.GetAsInteger(out);
 }
 
 bool PopulateItem(const base::Value& from, int* out, base::string16* error) {
-  if (!from.GetAsInteger(out)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected integer, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsInteger(out))
+    return ReportError(from, base::Value::TYPE_INTEGER, error);
   return true;
 }
 
 bool PopulateItem(const base::Value& from, bool* out) {
   return from.GetAsBoolean(out);
 }
 
 bool PopulateItem(const base::Value& from, bool* out, base::string16* error) {
-  if (!from.GetAsBoolean(out)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected boolean, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsBoolean(out))
+    return ReportError(from, base::Value::TYPE_BOOLEAN, error);
   return true;
 }
 
 bool PopulateItem(const base::Value& from, double* out) {
   return from.GetAsDouble(out);
 }
 
 bool PopulateItem(const base::Value& from, double* out, base::string16* error) {
-  if (!from.GetAsDouble(out)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected double, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsDouble(out))
+    return ReportError(from, base::Value::TYPE_DOUBLE, error);
   return true;
 }
 
 bool PopulateItem(const base::Value& from, std::string* out) {
   return from.GetAsString(out);
 }
 
 bool PopulateItem(const base::Value& from,
                   std::string* out,
                   base::string16* error) {
-  if (!from.GetAsString(out)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected string, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsString(out))
+    return ReportError(from, base::Value::TYPE_STRING, error);
   return true;
 }
 
 bool PopulateItem(const base::Value& from, std::vector<char>* out) {
   const base::BinaryValue* binary = nullptr;
   if (!from.GetAsBinary(&binary))
     return false;
   out->assign(binary->GetBuffer(), binary->GetBuffer() + binary->GetSize());
   return true;
 }
 
 bool PopulateItem(const base::Value& from,
                   std::vector<char>* out,
                   base::string16* error) {
   const base::BinaryValue* binary = nullptr;
-  if (!from.GetAsBinary(&binary)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected binary, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsBinary(&binary))
+    return ReportError(from, base::Value::TYPE_BINARY, error);
   out->assign(binary->GetBuffer(), binary->GetBuffer() + binary->GetSize());
   return true;
 }
 
 bool PopulateItem(const base::Value& from, std::unique_ptr<base::Value>* out) {
   *out = from.CreateDeepCopy();
   return true;
 }
 
 bool PopulateItem(const base::Value& from,
                   std::unique_ptr<base::Value>* out,
                   base::string16* error) {
   *out = from.CreateDeepCopy();
   return true;
 }
 
 bool PopulateItem(const base::Value& from,
                   std::unique_ptr<base::DictionaryValue>* out) {
   const base::DictionaryValue* dict = nullptr;
   if (!from.GetAsDictionary(&dict))
     return false;
   *out = dict->CreateDeepCopy();
   return true;
 }
 
 bool PopulateItem(const base::Value& from,
                   std::unique_ptr<base::DictionaryValue>* out,
                   base::string16* error) {
   const base::DictionaryValue* dict = nullptr;
-  if (!from.GetAsDictionary(&dict)) {
-    if (error->length()) {
-      error->append(base::UTF8ToUTF16("; "));
-    }
-    error->append(base::UTF8ToUTF16("expected dictionary, got " +
-                                    ValueTypeToString(from.GetType())));
-    return false;
-  }
+  if (!from.GetAsDictionary(&dict))
+    return ReportError(from, base::Value::TYPE_DICTIONARY, error);
   *out = dict->CreateDeepCopy();
   return true;
 }
 
 void AddItemToList(const int from, base::ListValue* out) {
   out->AppendInteger(from);
 }
 
 void AddItemToList(const bool from, base::ListValue* out) {
   out->AppendBoolean(from);
@@ skipping 15 matching lines @@
 void AddItemToList(const std::unique_ptr<base::Value>& from,
                    base::ListValue* out) {
   out->Append(from->CreateDeepCopy());
 }
 
 void AddItemToList(const std::unique_ptr<base::DictionaryValue>& from,
                    base::ListValue* out) {
   out->Append(from->CreateDeepCopy());
 }
 
-std::string ValueTypeToString(base::Value::Type type) {
-  switch (type) {
-    case base::Value::TYPE_NULL:
-      return "null";
-    case base::Value::TYPE_BOOLEAN:
-      return "boolean";
-    case base::Value::TYPE_INTEGER:
-      return "integer";
-    case base::Value::TYPE_DOUBLE:
-      return "number";

[Lei Zhang, 2016/07/16 02:02:23]

https://codereview.chromium.org/16462004/diff/30001/tools/json_schema_compile...
suggested "number" instead of "double" but does it really matter?

[Devlin, 2016/07/18 13:29:46]

I think the motivation was since these values largely come from JS (or
JS-adjacent) code, where "number" is more canonical.  But I don't think we
really surface these errors anywhere where it will be string-sensitive, so this
is probably fine.

-    case base::Value::TYPE_STRING:
-      return "string";
-    case base::Value::TYPE_BINARY:
-      return "binary";
-    case base::Value::TYPE_DICTIONARY:
-      return "dictionary";
-    case base::Value::TYPE_LIST:
-      return "list";
-  }
-  NOTREACHED();
-  return "";
-}
-
 }  // namespace util
 }  // namespace json_schema_compiler