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

chrome/common/json_value_serializer_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/basictypes.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
@@ skipping 177 matching lines @@
   root.reset(serializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(root.get());
   root_expected.reset(serializer_expected.Deserialize(NULL, NULL));
   ASSERT_TRUE(root_expected.get());
   ASSERT_TRUE(root->Equals(root_expected.get()));
 }
 
 namespace {
 
 void ValidateJsonList(const std::string& json) {
-  scoped_ptr<Value> root(base::JSONReader::Read(json, false));
+  scoped_ptr<Value> root(base::JSONReader::Read(json));
   ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   int value = 0;
   ASSERT_TRUE(elt && elt->GetAsInteger(&value));
   ASSERT_EQ(1, value);
 }
 
 }  // namespace
 
 TEST(JSONValueSerializerTest, JSONReaderComments) {
   ValidateJsonList("[ // 2, 3, ignore me ] \n1 ]");
   ValidateJsonList("[ /* 2, \n3, ignore me ]*/ \n1 ]");
   ValidateJsonList("//header\n[ // 2, \n// 3, \n1 ]// footer");
   ValidateJsonList("/*\n[ // 2, \n// 3, \n1 ]*/[1]");
   ValidateJsonList("[ 1 /* one */ ] /* end */");
   ValidateJsonList("[ 1 //// ,2\r\n ]");
 
   scoped_ptr<Value> root;
 
   // It's ok to have a comment in a string.
-  root.reset(base::JSONReader::Read("[\"// ok\\n /* foo */ \"]", false));
+  root.reset(base::JSONReader::Read("[\"// ok\\n /* foo */ \"]"));
   ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   std::string value;
   ASSERT_TRUE(elt && elt->GetAsString(&value));
   ASSERT_EQ("// ok\n /* foo */ ", value);
 
   // You can't nest comments.
-  root.reset(base::JSONReader::Read("/* /* inner */ outer */ [ 1 ]", false));
+  root.reset(base::JSONReader::Read("/* /* inner */ outer */ [ 1 ]"));
   ASSERT_FALSE(root.get());
 
   // Not a open comment token.
-  root.reset(base::JSONReader::Read("/ * * / [1]", false));
+  root.reset(base::JSONReader::Read("/ * * / [1]"));
   ASSERT_FALSE(root.get());
 }
 
 class JSONFileValueSerializerTest : public testing::Test {
 protected:
   virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
 
   ScopedTempDir temp_dir_;
@@ skipping 82 matching lines @@
   FilePath source_file_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path));
   source_file_path = source_file_path.Append(
       FILE_PATH_LITERAL("serializer_test_nowhitespace.js"));
   ASSERT_TRUE(file_util::PathExists(source_file_path));
   JSONFileValueSerializer serializer(source_file_path);
   scoped_ptr<Value> root;
   root.reset(serializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(root.get());
 }