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

remoting/host/plugin/host_script_object.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 "remoting/host/plugin/host_script_object.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 660 matching lines @@
 
 bool HostNPScriptObject::UpdateDaemonConfig(const NPVariant* args,
                                             uint32_t arg_count,
                                             NPVariant* result) {
   if (arg_count != 2) {
     SetException("updateDaemonConfig: bad number of arguments");
     return false;
   }
 
   std::string config_str = StringFromNPVariant(args[0]);
-  scoped_ptr<base::Value> config(base::JSONReader::Read(config_str, true));
+  scoped_ptr<base::Value> config(
+      base::JSONReader::Read(config_str, base::JSON_ALLOW_TRAILING_COMMAS));
   if (config_str.empty() || !config.get() ||
       !config->IsType(base::Value::TYPE_DICTIONARY)) {
     SetException("updateDaemonConfig: bad config parameter");
     return false;
   }
   scoped_ptr<base::DictionaryValue> config_dict(
       reinterpret_cast<base::DictionaryValue*>(config.release()));
 
   ScopedRefNPObject callback_obj(ObjectFromNPVariant(args[1]));
   if (callback_obj.get()) {
@@ skipping 40 matching lines @@
 
 bool HostNPScriptObject::StartDaemon(const NPVariant* args,
                                      uint32_t arg_count,
                                      NPVariant* result) {
   if (arg_count != 2) {
     SetException("startDaemon: bad number of arguments");
     return false;
   }
 
   std::string config_str = StringFromNPVariant(args[0]);
-  scoped_ptr<base::Value> config(base::JSONReader::Read(config_str, true));
+  scoped_ptr<base::Value> config(
+      base::JSONReader::Read(config_str, base::JSON_ALLOW_TRAILING_COMMAS));
   if (config_str.empty() || !config.get() ||
       !config->IsType(base::Value::TYPE_DICTIONARY)) {
     SetException("updateDaemonConfig: bad config parameter");
     return false;
   }
   scoped_ptr<base::DictionaryValue> config_dict(
       reinterpret_cast<base::DictionaryValue*>(config.release()));
 
   ScopedRefNPObject callback_obj(ObjectFromNPVariant(args[1]));
   if (!callback_obj.get()) {
@@ skipping 364 matching lines @@
   return is_good;
 }
 
 void HostNPScriptObject::SetException(const std::string& exception_string) {
   DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread());
   g_npnetscape_funcs->setexception(parent_, exception_string.c_str());
   LOG(INFO) << exception_string;
 }
 
 }  // namespace remoting