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

base/json/json_reader.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_reader.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 75 matching lines @@
     : start_pos_(NULL),
       json_pos_(NULL),
       end_pos_(NULL),
       stack_depth_(0),
       allow_trailing_comma_(false),
       error_code_(JSON_NO_ERROR),
       error_line_(0),
       error_col_(0) {}
 
 // static
+Value* JSONReader::Read(const std::string& json) {
+  return Read(json, JSON_PARSE_RFC);
+}
+
+// static
 Value* JSONReader::Read(const std::string& json,
-                        bool allow_trailing_comma) {
-  return ReadAndReturnError(json, allow_trailing_comma, NULL, NULL);
+                        int options) {
+  return ReadAndReturnError(json, options, NULL, NULL);
 }
 
 // static
 Value* JSONReader::ReadAndReturnError(const std::string& json,
-                                      bool allow_trailing_comma,
+                                      int options,
                                       int* error_code_out,
                                       std::string* error_msg_out) {
   JSONReader reader = JSONReader();
-  Value* root = reader.JsonToValue(json, true, allow_trailing_comma);
+  Value* root = reader.JsonToValue(json, false,
+      (options & JSON_ALLOW_TRAILING_COMMAS) != 0);
   if (root)
     return root;
 
   if (error_code_out)
     *error_code_out = reader.error_code();
   if (error_msg_out)
     *error_msg_out = reader.GetErrorMessage();
 
   return NULL;
 }
@@ skipping 601 matching lines @@
       ++column_number;
     }
   }
 
   error_line_ = line_number;
   error_col_ = column_number;
   error_code_ = error;
 }
 
 }  // namespace base