Adds option for JSON reader to allow invalid utf characters

base/json/json_string_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_STRING_VALUE_SERIALIZER_H_
 #define BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_
 
 #include <string>
 
 #include "base/base_export.h"
@@ skipping 29 matching lines @@
   // Owned by the caller of the constructor.
   std::string* json_string_;
   bool pretty_print_;  // If true, serialization will span multiple lines.
 
   DISALLOW_COPY_AND_ASSIGN(JSONStringValueSerializer);
 };
 
 class BASE_EXPORT JSONStringValueDeserializer : public base::ValueDeserializer {
  public:
   // This retains a reference to the contents of |json_string|, so the data
-  // must outlive the JSONStringValueDeserializer.
-  explicit JSONStringValueDeserializer(const base::StringPiece& json_string);
+  // must outlive the JSONStringValueDeserializer. |options| is a bitmask of
+  // JSONParserOptions.
+  explicit JSONStringValueDeserializer(const base::StringPiece& json_string,
+                                       int options = 0);
 
   ~JSONStringValueDeserializer() override;
 
   // Attempt to deserialize the data structure encoded in the string 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 (a JsonParseError in this case).
   // 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.
   std::unique_ptr<base::Value> Deserialize(int* error_code,
                                            std::string* error_message) override;
 
-  void set_allow_trailing_comma(bool new_value) {
-    allow_trailing_comma_ = new_value;
-  }
-
  private:
   // Data is owned by the caller of the constructor.
   base::StringPiece json_string_;
-  // If true, deserialization will allow trailing commas.
-  bool allow_trailing_comma_;
+  const int options_;
 
   DISALLOW_COPY_AND_ASSIGN(JSONStringValueDeserializer);
 };
 
 #endif  // BASE_JSON_JSON_STRING_VALUE_SERIALIZER_H_