Overhaul JSON Schema Compiler to support a number of features required to

tools/json_schema_compiler/util.h

 // 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.
 
 #ifndef TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__
 #define TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__
 
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 namespace json_schema_compiler {
 
-namespace any {
-class Any;
-}
-
 namespace util {
 
 // Creates a new item at |out| from |from|[|index|]. These are used by template
 // specializations of |Get(Optional)ArrayFromList|.
 bool GetItemFromList(const ListValue& from, int index, int* out);
 bool GetItemFromList(const ListValue& from, int index, bool* out);
 bool GetItemFromList(const ListValue& from, int index, double* out);
 bool GetItemFromList(const ListValue& from, int index, std::string* out);
-bool GetItemFromList(const ListValue& from, int index,
-    linked_ptr<base::DictionaryValue>* out);
-bool GetItemFromList(const ListValue& from, int index,
-    linked_ptr<any::Any>* out);
+bool GetItemFromList(const ListValue& from,
+                     int index,
+                     linked_ptr<base::Value>* out);
+bool GetItemFromList(const ListValue& from,
+                     int index,
+                     linked_ptr<base::DictionaryValue>* out);
 
 // This template is used for types generated by tools/json_schema_compiler.
 template<class T>
 bool GetItemFromList(const ListValue& from, int index, linked_ptr<T>* out) {
   const DictionaryValue* dict;
   if (!from.GetDictionary(index, &dict))
     return false;
   scoped_ptr<T> obj(new T());
   if (!T::Populate(*dict, obj.get()))
     return false;
@@ skipping 84 matching lines @@
 
   return PopulateOptionalArrayFromList(*list, out);
 }
 
 // Appends a Value newly created from |from| to |out|. These used by template
 // specializations of |Set(Optional)ArrayToList|.
 void AddItemToList(const int from, base::ListValue* out);
 void AddItemToList(const bool from, base::ListValue* out);
 void AddItemToList(const double from, base::ListValue* out);
 void AddItemToList(const std::string& from, base::ListValue* out);
+void AddItemToList(const linked_ptr<base::Value>& from,
+                   base::ListValue* out);
 void AddItemToList(const linked_ptr<base::DictionaryValue>& from,
-    base::ListValue* out);
-void AddItemToList(const linked_ptr<any::Any>& from,
-    base::ListValue* out);
+                   base::ListValue* out);
 
 // This template is used for types generated by tools/json_schema_compiler.
 template<class T>
 void AddItemToList(const linked_ptr<T>& from, ListValue* out) {
   out->Append(from->ToValue().release());
 }
 
 // Set |out| to the the contents of |from|. Requires GetItemFromList to be
 // implemented for |T|.
 template <class T>
@@ skipping 12 matching lines @@
 template <class T>
 void PopulateListFromOptionalArray(
     const scoped_ptr<std::vector<T> >& from,
     base::ListValue* out) {
   if (from.get())
     PopulateListFromArray(*from, out);
 
 }
 
 template <class T>
-scoped_ptr<Value> CreateValueFromArray(
-    const std::vector<T>& from) {
+scoped_ptr<Value> CreateValueFromArray(const std::vector<T>& from) {
   base::ListValue* list = new base::ListValue();
   PopulateListFromArray(from, list);
   return scoped_ptr<Value>(list);
 }
 
 template <class T>
 scoped_ptr<Value> CreateValueFromOptionalArray(
     const scoped_ptr<std::vector<T> >& from) {
   if (from.get())
     return CreateValueFromArray(*from);
   return scoped_ptr<Value>();
 }
 
 }  // namespace util
 }  // namespace json_schema_compiler
 
 #endif // TOOLS_JSON_SCHEMA_COMPILER_UTIL_H__