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

tools/json_schema_compiler/test/idl_schemas_unittest.cc

Index: tools/json_schema_compiler/test/idl_schemas_unittest.cc
diff --git a/tools/json_schema_compiler/test/idl_schemas_unittest.cc b/tools/json_schema_compiler/test/idl_schemas_unittest.cc
index 8afb59c835c4bbcddcc53e530bedac5045ac9313..5593bc19c6f491e6f2232257cabd8531319c4e6f 100644
--- a/tools/json_schema_compiler/test/idl_schemas_unittest.cc
+++ b/tools/json_schema_compiler/test/idl_schemas_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/values.h"
-#include "tools/json_schema_compiler/any.h"
 #include "tools/json_schema_compiler/test/idl_basics.h"
 #include "tools/json_schema_compiler/test/idl_object_types.h"
 
@@ -167,13 +166,12 @@ TEST(IdlCompiler, ObjectTypes) {
 
   // Test the BarType type.
   BarType b1;
-  base::FundamentalValue seven(7);
-  b1.x.Init(seven);
+  b1.x.reset(new base::FundamentalValue(7));
   scoped_ptr<DictionaryValue> serialized_bar = b1.ToValue();
   BarType b2;
   EXPECT_TRUE(BarType::Populate(*serialized_bar.get(), &b2));
   int tmp_int = 0;
-  EXPECT_TRUE(b2.x.value().GetAsInteger(&tmp_int));
+  EXPECT_TRUE(b2.x->GetAsInteger(&tmp_int));
   EXPECT_EQ(7, tmp_int);
 
   // Test the params to the ObjectFunction1 function.
@@ -188,6 +186,6 @@ TEST(IdlCompiler, ObjectTypes) {
     ObjectFunction1::Params::Create(list);
   ASSERT_TRUE(params.get() != NULL);
   std::string tmp;
-  EXPECT_TRUE(params->icon.additional_properties.GetString("hello", &tmp));
+  EXPECT_TRUE(params->icon.additional_properties["hello"]->GetAsString(&tmp));
   EXPECT_EQ("world", tmp);
 }