Adds option for JSON reader to allow invalid utf characters

base/json/json_file_value_serializer.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_file_value_serializer.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "build/build_config.h"
@@ skipping 35 matching lines @@
 
   int data_size = static_cast<int>(json_string.size());
   if (base::WriteFile(json_file_path_, json_string.data(), data_size) !=
       data_size)
     return false;
 
   return true;
 }
 
 JSONFileValueDeserializer::JSONFileValueDeserializer(
-    const base::FilePath& json_file_path)
-    : json_file_path_(json_file_path),
-      allow_trailing_comma_(false),
-      last_read_size_(0U) {
-}
+    const base::FilePath& json_file_path,
+    int options)
+    : json_file_path_(json_file_path), options_(options), last_read_size_(0U) {}
 
 JSONFileValueDeserializer::~JSONFileValueDeserializer() {
 }
 
 int JSONFileValueDeserializer::ReadFileToString(std::string* json_string) {
   DCHECK(json_string);
   if (!base::ReadFileToString(json_file_path_, json_string)) {
 #if defined(OS_WIN)
     int error = ::GetLastError();
     if (error == ERROR_SHARING_VIOLATION || error == ERROR_LOCK_VIOLATION) {
@@ skipping 36 matching lines @@
   std::string json_string;
   int error = ReadFileToString(&json_string);
   if (error != JSON_NO_ERROR) {
     if (error_code)
       *error_code = error;
     if (error_str)
       *error_str = GetErrorMessageForCode(error);
     return NULL;
   }
 
-  JSONStringValueDeserializer deserializer(json_string);
-  deserializer.set_allow_trailing_comma(allow_trailing_comma_);
+  JSONStringValueDeserializer deserializer(json_string, options_);
   return deserializer.Deserialize(error_code, error_str);
 }