Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

base/json/json_value_converter_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 "base/json/json_value_converter.h"
 
 #include <string>
 #include <vector>
 
 #include "base/values.h"
@@ skipping 61 matching lines @@
 TEST(JSONValueConverterTest, ParseSimpleMessage) {
   const char normal_data[] =
       "{\n"
       "  \"foo\": 1,\n"
       "  \"bar\": \"bar\",\n"
       "  \"baz\": true,\n"
       "  \"simple_enum\": \"foo\","
       "  \"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));
 
   EXPECT_EQ(1, message.foo);
   EXPECT_EQ("bar", message.bar);
   EXPECT_TRUE(message.baz);
   EXPECT_EQ(SimpleMessage::FOO, message.simple_enum);
   EXPECT_EQ(2, static_cast<int>(message.ints.size()));
   EXPECT_EQ(1, *(message.ints[0]));
@@ skipping 14 matching lines @@
       "    \"bar\": \"foobar\",\n"
       "    \"baz\": true\n"
       "  },\n"
       "  {\n"
       "    \"foo\": 3,\n"
       "    \"bar\": \"barbaz\",\n"
       "    \"baz\": false\n"
       "  }]\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));
 
   EXPECT_EQ(1.0, message.foo);
   EXPECT_EQ(1, message.child.foo);
   EXPECT_EQ("bar", message.child.bar);
   EXPECT_TRUE(message.child.baz);
 
   EXPECT_EQ(2, static_cast<int>(message.children.size()));
@@ skipping 12 matching lines @@
 
 TEST(JSONValueConverterTest, ParseFailures) {
   const char normal_data[] =
       "{\n"
       "  \"foo\": 1,\n"
       "  \"bar\": 2,\n" // "bar" is an integer here.
       "  \"baz\": true,\n"
       "  \"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));
   // Do not check the values below.  |message| may be modified during
   // Convert() even it fails.
 }
 
 TEST(JSONValueConverterTest, ParseWithMissingFields) {
   const char normal_data[] =
       "{\n"
       "  \"foo\": 1,\n"
       "  \"baz\": true,\n"
       "  \"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.
   EXPECT_TRUE(converter.Convert(*value.get(), &message));
 
   EXPECT_EQ(1, message.foo);
   EXPECT_TRUE(message.baz);
   EXPECT_EQ(2, static_cast<int>(message.ints.size()));
   EXPECT_EQ(1, *(message.ints[0]));
   EXPECT_EQ(2, *(message.ints[1]));
 }
 
 TEST(JSONValueConverterTest, EnumParserFails) {
   const char normal_data[] =
       "{\n"
       "  \"foo\": 1,\n"
       "  \"bar\": \"bar\",\n"
       "  \"baz\": true,\n"
       "  \"simple_enum\": \"baz\","
       "  \"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));
   // No check the values as mentioned above.
 }
 
 TEST(JSONValueConverterTest, RepeatedValueErrorInTheMiddle) {
   const char normal_data[] =
       "{\n"
       "  \"foo\": 1,\n"
       "  \"bar\": \"bar\",\n"
       "  \"baz\": true,\n"
       "  \"simple_enum\": \"baz\","
       "  \"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));
   // No check the values as mentioned above.
 }
 
 }  // namespace base