Allow trailing comma in JSON policy files.

chrome/browser/policy/config_dir_policy_provider.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 "chrome/browser/policy/config_dir_policy_provider.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/file_path.h"
@@ skipping 16 matching lines @@
                                             file_util::FileEnumerator::FILES);
   for (FilePath config_file_path = file_enumerator.Next();
        !config_file_path.empty(); config_file_path = file_enumerator.Next())
     files.insert(config_file_path);
 
   // Start with an empty dictionary and merge the files' contents.
   DictionaryValue* policy = new DictionaryValue;
   for (std::set<FilePath>::iterator config_file_iter = files.begin();
        config_file_iter != files.end(); ++config_file_iter) {
     JSONFileValueSerializer deserializer(*config_file_iter);
+    deserializer.set_allow_trailing_comma(true);
     int error_code = 0;
     std::string error_msg;
     scoped_ptr<Value> value(deserializer.Deserialize(&error_code, &error_msg));
     if (!value.get()) {
       LOG(WARNING) << "Failed to read configuration file "
                    << config_file_iter->value() << ": " << error_msg;
       continue;
     }
     if (!value->IsType(Value::TYPE_DICTIONARY)) {
       LOG(WARNING) << "Expected JSON dictionary in configuration file "
@@ skipping 34 matching lines @@
 
 ConfigDirPolicyProvider::ConfigDirPolicyProvider(
     const PolicyDefinitionList* policy_list,
     const FilePath& config_dir)
     : FileBasedPolicyProvider(
         policy_list,
         new ConfigDirPolicyProviderDelegate(config_dir)) {
 }
 
 }  // namespace policy