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

chrome/common/extensions/simple_feature_provider.cc

Index: chrome/common/extensions/simple_feature_provider.cc
diff --git a/chrome/common/extensions/simple_feature_provider.cc b/chrome/common/extensions/simple_feature_provider.cc
index 63741aa755b037961ef9eb3e781c720e26cbc8a9..08bed3131f5592d8f6779edbc0a3c40599b6810e 100644
--- a/chrome/common/extensions/simple_feature_provider.cc
+++ b/chrome/common/extensions/simple_feature_provider.cc
@@ -15,8 +15,6 @@ namespace extensions {
 
 namespace {
 
-const bool kAllowTrailingComma = false;
-
 template<class FeatureClass>
 Feature* CreateFeature() {
   return new FeatureClass();
@@ -48,7 +46,8 @@ struct Static {
     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;