Add wider support to json_schema_compiler

tools/json_schema_compiler/test/simple_api_unittest.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/test/simple_api.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using namespace test::api::simple_api;
 
@@ skipping 19 matching lines @@
 
 TEST(JsonSchemaCompilerSimpleTest, IncrementIntegerParamsCreate) {
   scoped_ptr<ListValue> params_value(new ListValue());
   params_value->Append(Value::CreateIntegerValue(6));
   scoped_ptr<IncrementInteger::Params> params(
       IncrementInteger::Params::Create(*params_value));
   EXPECT_TRUE(params.get());
   EXPECT_EQ(6, params->num);
 }
 
+TEST(JsonSchemaCompilerSimpleTest, NumberOfParams) {
+  {
+    scoped_ptr<ListValue> params_value(new ListValue());
+    params_value->Append(Value::CreateStringValue("text"));
+    params_value->Append(Value::CreateStringValue("text"));
+    scoped_ptr<OptionalString::Params> params(
+        OptionalString::Params::Create(*params_value));
+    EXPECT_FALSE(params.get());
+  }
+  {
+    scoped_ptr<ListValue> params_value(new ListValue());
+    scoped_ptr<IncrementInteger::Params> params(
+        IncrementInteger::Params::Create(*params_value));
+    EXPECT_FALSE(params.get());
+  }
+}
+
 TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsCreate) {
   {
     scoped_ptr<ListValue> params_value(new ListValue());
     scoped_ptr<OptionalString::Params> params(
         OptionalString::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
     EXPECT_FALSE(params->str.get());
   }
   {
     scoped_ptr<ListValue> params_value(new ListValue());
@@ skipping 40 matching lines @@
     EXPECT_TRUE(TestType::Populate(*value, test_type.get()));
     EXPECT_EQ("bling", test_type->string);
     EXPECT_EQ(1.1, test_type->number);
     EXPECT_EQ(4, test_type->integer);
     EXPECT_EQ(true, test_type->boolean);
     EXPECT_TRUE(value->Equals(test_type->ToValue().get()));
   }
   {
     scoped_ptr<TestType> test_type(new TestType());
     scoped_ptr<DictionaryValue> value = CreateTestTypeDictionary();
-    value->RemoveWithoutPathExpansion("number", NULL);
+    value->Remove("number", NULL);
     EXPECT_FALSE(TestType::Populate(*value, test_type.get()));
   }
 }
 
 TEST(JsonSchemaCompilerSimpleTest, GetTestType) {
   scoped_ptr<DictionaryValue> value = CreateTestTypeDictionary();
   scoped_ptr<TestType> test_type(new TestType());
   EXPECT_TRUE(TestType::Populate(*value, test_type.get()));
   scoped_ptr<Value> result(GetTestType::Result::Create(*test_type));
   EXPECT_TRUE(value->Equals(result.get()));
 }