Adds option for JSON reader to allow invalid utf characters

chromeos/tools/onc_validator/onc_validator.cc

 // Copyright (c) 2011 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 <stddef.h>
 #include <cstdio>
 #include <iostream>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
+#include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_validator.h"
 
 // TODO Check why this file do not fail on default trybots
 // http://crbug.com/543919
 
 // Command line switches.
 const char kSwitchErrorOnUnknownField[] = "error-on-unknown-field";
@@ skipping 59 matching lines @@
           kStatusValid,
           kStatusWarnings,
           kStatusInvalid,
           kStatusJsonError,
           kStatusArgumentError);
 }
 
 std::unique_ptr<base::DictionaryValue> ReadDictionary(
     const std::string& filename) {
   base::FilePath path(filename);
-  JSONFileValueDeserializer deserializer(path);
-  deserializer.set_allow_trailing_comma(true);
+  JSONFileValueDeserializer deserializer(path,
+                                         base::JSON_ALLOW_TRAILING_COMMAS);
 
   std::string json_error;
   std::unique_ptr<base::Value> value =
       deserializer.Deserialize(NULL, &json_error);
   if (!value) {
     LOG(ERROR) << "Couldn't json-deserialize file '" << filename
                << "': " << json_error;
     return nullptr;
   }
 
@@ skipping 57 matching lines @@
     case chromeos::onc::Validator::VALID:
       return kStatusValid;
     case chromeos::onc::Validator::VALID_WITH_WARNINGS:
       return kStatusWarnings;
     case chromeos::onc::Validator::INVALID:
       return kStatusInvalid;
     default:
       CHECK(false);
   }
 }