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

chrome/common/extensions/simple_feature_provider.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/common/extensions/simple_feature_provider.h"
 
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "chrome/common/extensions/manifest_feature.h"
 #include "chrome/common/extensions/permission_feature.h"
 #include "grit/common_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace extensions {
 
 namespace {
 
-const bool kAllowTrailingComma = false;
-
 template<class FeatureClass>
 Feature* CreateFeature() {
   return new FeatureClass();
 }
 
 struct Static {
   Static()
       : manifest_features(
             LoadProvider("manifest",
                          &CreateFeature<ManifestFeature>,
@@ skipping 11 matching lines @@
   scoped_ptr<SimpleFeatureProvider> LoadProvider(
       const std::string& debug_string,
       SimpleFeatureProvider::FeatureFactory factory,
       int resource_id) {
     std::string manifest_features =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             resource_id).as_string();
     int error_code = 0;
     std::string error_message;
     Value* value = base::JSONReader::ReadAndReturnError(
-        manifest_features, kAllowTrailingComma, &error_code, &error_message);
+        manifest_features, base::JSON_PARSE_RFC,
+        &error_code, &error_message);
     CHECK(value) << "Could not load features: " << debug_string << " "
                  << error_message;
     CHECK(value->IsType(Value::TYPE_DICTIONARY)) << debug_string;
     scoped_ptr<DictionaryValue> dictionary_value(
         static_cast<DictionaryValue*>(value));
     return scoped_ptr<SimpleFeatureProvider>(
         new SimpleFeatureProvider(dictionary_value.get(), factory));
   }
 };
 
@@ skipping 54 matching lines @@
 
 Feature* SimpleFeatureProvider::GetFeature(const std::string& name) {
   FeatureMap::iterator iter = features_.find(name);
   if (iter != features_.end())
     return iter->second.get();
   else
     return NULL;
 }
 
 }  // namespace