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

chrome/browser/policy/configuration_policy_handler_chromeos.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 "chrome/browser/policy/configuration_policy_handler_chromeos.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 56 matching lines @@
   policies->Set(policy_name(), entry->level, entry->scope, sanitized_config);
 }
 
 // static
 Value* NetworkConfigurationPolicyHandler::SanitizeNetworkConfig(
     const Value* config) {
   std::string json_string;
   if (!config->GetAsString(&json_string))
     return NULL;
 
-  scoped_ptr<Value> json_value(base::JSONReader::Read(json_string, true));
+  scoped_ptr<Value> json_value(
+      base::JSONReader::Read(json_string, base::JSON_ALLOW_TRAILING_COMMAS));
   if (!json_value.get() || !json_value->IsType(base::Value::TYPE_DICTIONARY))
     return NULL;
 
   DictionaryValue* config_dict =
       static_cast<DictionaryValue*>(json_value.get());
 
   // Strip any sensitive information from the JSON dictionary.
   base::ListValue* config_list = NULL;
   if (config_dict->GetList("NetworkConfigurations", &config_list)) {
     for (base::ListValue::const_iterator network_entry = config_list->begin();
@@ skipping 30 matching lines @@
 
   for (size_t i = 0; i < arraysize(kFilteredSettings); ++i) {
     if (network_dict->Remove(kFilteredSettings[i], NULL)) {
       network_dict->Set(kFilteredSettings[i],
                         Value::CreateStringValue(kPlaceholder));
     }
   }
 }
 
 }  // namespace policy