Adds option for JSON reader to allow invalid utf characters

base/json/json_file_value_serializer.h

 // 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.
 
 #ifndef BASE_JSON_JSON_FILE_VALUE_SERIALIZER_H_
 #define BASE_JSON_JSON_FILE_VALUE_SERIALIZER_H_
 
 #include <stddef.h>
 
 #include <string>
@@ skipping 30 matching lines @@
   bool SerializeInternal(const base::Value& root, bool omit_binary_values);
 
   const base::FilePath json_file_path_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueSerializer);
 };
 
 class BASE_EXPORT JSONFileValueDeserializer : public base::ValueDeserializer {
  public:
   // |json_file_path_| is the path of a file that will be source of the
-  // deserialization.
-  explicit JSONFileValueDeserializer(const base::FilePath& json_file_path);
+  // deserialization. |options| is a bitmask of JSONParserOptions.
+  explicit JSONFileValueDeserializer(const base::FilePath& json_file_path,
+                                     int options = 0);
 
   ~JSONFileValueDeserializer() override;
 
   // Attempt to deserialize the data structure encoded in the file passed
   // in to the constructor into a structure of Value objects.  If the return
   // value is NULL, and if |error_code| is non-null, |error_code| will
   // contain an integer error code (either JsonFileError or JsonParseError).
   // If |error_message| is non-null, it will be filled in with a formatted
   // error message including the location of the error if appropriate.
   // The caller takes ownership of the returned value.
@@ skipping 12 matching lines @@
   // File-specific error messages that can be returned.
   static const char kAccessDenied[];
   static const char kCannotReadFile[];
   static const char kFileLocked[];
   static const char kNoSuchFile[];
 
   // Convert an error code into an error message.  |error_code| is assumed to
   // be a JsonFileError.
   static const char* GetErrorMessageForCode(int error_code);
 
-  void set_allow_trailing_comma(bool new_value) {
-    allow_trailing_comma_ = new_value;
-  }
-
   // Returns the size (in bytes) of JSON string read from disk in the last
   // successful |Deserialize()| call.
   size_t get_last_read_size() const { return last_read_size_; }
 
  private:
   // A wrapper for ReadFileToString which returns a non-zero JsonFileError if
   // there were file errors.
   int ReadFileToString(std::string* json_string);
 
   const base::FilePath json_file_path_;
-  bool allow_trailing_comma_;
+  const int options_;
   size_t last_read_size_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JSONFileValueDeserializer);
 };
 
 #endif  // BASE_JSON_JSON_FILE_VALUE_SERIALIZER_H_