diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
| commit | cd57857578b7b905ee27580d8ca279f6f7642e82 (patch) | |
| tree | 82230a21554f358452b508ee64ef1ea3efcb518b /base/json/json_value_converter_unittest.cc | |
| parent | cc7cde43832b547cdab856fe1bedc9514ca38e13 (diff) | |
| download | chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.zip chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.gz chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.bz2 | |
Modify the base::JSONReader interface to take a set of options rather than a boolean flag.
This is just prep work for a large CL that rewrites the JSON parser. Splitting
out this interface change will make it easier to review the other CL.
BUG=121469
TEST=No functional change.
Review URL: https://chromiumcodereview.appspot.com/9960077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json/json_value_converter_unittest.cc')
| -rw-r--r-- | base/json/json_value_converter_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/json/json_value_converter_unittest.cc b/base/json/json_value_converter_unittest.cc index b81a52c..46b06ed 100644 --- a/base/json/json_value_converter_unittest.cc +++ b/base/json/json_value_converter_unittest.cc @@ -79,7 +79,7 @@ TEST(JSONValueConverterTest, ParseSimpleMessage) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_TRUE(converter.Convert(*value.get(), &message)); @@ -114,7 +114,7 @@ TEST(JSONValueConverterTest, ParseNestedMessage) { " }]\n" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); NestedMessage message; base::JSONValueConverter<NestedMessage> converter; EXPECT_TRUE(converter.Convert(*value.get(), &message)); @@ -147,7 +147,7 @@ TEST(JSONValueConverterTest, ParseFailures) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); @@ -163,7 +163,7 @@ TEST(JSONValueConverterTest, ParseWithMissingFields) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; // Convert() still succeeds even if the input doesn't have "bar" field. @@ -186,7 +186,7 @@ TEST(JSONValueConverterTest, EnumParserFails) { " \"ints\": [1, 2]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); @@ -203,7 +203,7 @@ TEST(JSONValueConverterTest, RepeatedValueErrorInTheMiddle) { " \"ints\": [1, false]" "}\n"; - scoped_ptr<Value> value(base::JSONReader::Read(normal_data, false)); + scoped_ptr<Value> value(base::JSONReader::Read(normal_data)); SimpleMessage message; base::JSONValueConverter<SimpleMessage> converter; EXPECT_FALSE(converter.Convert(*value.get(), &message)); |