| Index: tools/json_schema_compiler/test/functions_as_parameters_unittest.cc
|
| diff --git a/tools/json_schema_compiler/test/functions_as_parameters_unittest.cc b/tools/json_schema_compiler/test/functions_as_parameters_unittest.cc
|
| index f53e434f153bf6a890276438ded4cb4edf939951..ce7a2f981659d16a6bf4cdf5fbe8902cb390db39 100644
|
| --- a/tools/json_schema_compiler/test/functions_as_parameters_unittest.cc
|
| +++ b/tools/json_schema_compiler/test/functions_as_parameters_unittest.cc
|
| @@ -12,13 +12,13 @@ TEST(JsonSchemaCompilerFunctionsAsParametersTest, PopulateRequiredFunction) {
|
| // The expectation is that if any value is set for the function, then
|
| // the function is "present".
|
| {
|
| - DictionaryValue empty_value;
|
| + base::DictionaryValue empty_value;
|
| FunctionType out;
|
| EXPECT_FALSE(FunctionType::Populate(empty_value, &out));
|
| }
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue function_dict;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue function_dict;
|
| value.Set("event_callback", function_dict.DeepCopy());
|
| FunctionType out;
|
| ASSERT_TRUE(FunctionType::Populate(value, &out));
|
| @@ -28,8 +28,8 @@ TEST(JsonSchemaCompilerFunctionsAsParametersTest, PopulateRequiredFunction) {
|
|
|
| TEST(JsonSchemaCompilerFunctionsAsParametersTest, RequiredFunctionToValue) {
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue function_dict;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue function_dict;
|
| value.Set("event_callback", function_dict.DeepCopy());
|
|
|
| FunctionType out;
|
| @@ -37,9 +37,9 @@ TEST(JsonSchemaCompilerFunctionsAsParametersTest, RequiredFunctionToValue) {
|
| EXPECT_TRUE(value.Equals(out.ToValue().get()));
|
| }
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue expected_value;
|
| - DictionaryValue function_dict;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue expected_value;
|
| + base::DictionaryValue function_dict;
|
| value.Set("event_callback", function_dict.DeepCopy());
|
| expected_value.Set("event_callback", function_dict.DeepCopy());
|
|
|
| @@ -51,22 +51,22 @@ TEST(JsonSchemaCompilerFunctionsAsParametersTest, RequiredFunctionToValue) {
|
|
|
| TEST(JsonSchemaCompilerFunctionsAsParametersTest, PopulateOptionalFunction) {
|
| {
|
| - DictionaryValue empty_value;
|
| + base::DictionaryValue empty_value;
|
| OptionalFunctionType out;
|
| ASSERT_TRUE(OptionalFunctionType::Populate(empty_value, &out));
|
| EXPECT_FALSE(out.event_callback.get());
|
| }
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue function_value;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue function_value;
|
| value.Set("event_callback", function_value.DeepCopy());
|
| OptionalFunctionType out;
|
| ASSERT_TRUE(OptionalFunctionType::Populate(value, &out));
|
| EXPECT_TRUE(out.event_callback.get());
|
| }
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue function_value;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue function_value;
|
| value.Set("event_callback", function_value.DeepCopy());
|
| OptionalFunctionType out;
|
| ASSERT_TRUE(OptionalFunctionType::Populate(value, &out));
|
| @@ -76,15 +76,15 @@ TEST(JsonSchemaCompilerFunctionsAsParametersTest, PopulateOptionalFunction) {
|
|
|
| TEST(JsonSchemaCompilerFunctionsAsParametersTest, OptionalFunctionToValue) {
|
| {
|
| - DictionaryValue empty_value;
|
| + base::DictionaryValue empty_value;
|
| OptionalFunctionType out;
|
| ASSERT_TRUE(OptionalFunctionType::Populate(empty_value, &out));
|
| // event_callback should not be set in the return from ToValue.
|
| EXPECT_TRUE(empty_value.Equals(out.ToValue().get()));
|
| }
|
| {
|
| - DictionaryValue value;
|
| - DictionaryValue function_value;
|
| + base::DictionaryValue value;
|
| + base::DictionaryValue function_value;
|
| value.Set("event_callback", function_value.DeepCopy());
|
|
|
| OptionalFunctionType out;
|
|
|