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

remoting/host/json_host_config.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/json_host_config.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 12 matching lines @@
 bool JsonHostConfig::Read() {
   DCHECK(CalledOnValidThread());
 
   // TODO(sergeyu): Implement better error handling here.
   std::string file_content;
   if (!file_util::ReadFileToString(filename_, &file_content)) {
     LOG(WARNING) << "Failed to read " << filename_.value();
     return false;
   }
 
-  scoped_ptr<Value> value(base::JSONReader::Read(file_content, true));
+  scoped_ptr<Value> value(
+      base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS));
   if (value.get() == NULL || !value->IsType(Value::TYPE_DICTIONARY)) {
     LOG(WARNING) << "Failed to parse " << filename_.value();
     return false;
   }
 
   DictionaryValue* dictionary = static_cast<DictionaryValue*>(value.release());
   values_.reset(dictionary);
   return true;
 }
 
 bool JsonHostConfig::Save() {
   DCHECK(CalledOnValidThread());
 
   std::string file_content;
   base::JSONWriter::WriteWithOptions(values_.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &file_content);
   // TODO(sergeyu): Move ImportantFileWriter to base and use it here.
   int result = file_util::WriteFile(filename_, file_content.c_str(),
                                     file_content.size());
   return result == static_cast<int>(file_content.size());
 }
 
 }  // namespace remoting