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

chrome/common/web_apps.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/common/web_apps.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 199 matching lines @@
                                    WebApplicationInfo* web_app,
                                    string16* error) {
   DCHECK(web_app->manifest_url.is_valid());
 
   int error_code = 0;
   std::string error_message;
   scoped_ptr<Value> schema(
       base::JSONReader::ReadAndReturnError(
           ResourceBundle::GetSharedInstance().GetRawDataResource(
               IDR_WEB_APP_SCHEMA).as_string(),
-          false,  // disallow trailing comma
+          base::JSON_PARSE_RFC,  // options
           &error_code,
           &error_message));
   DCHECK(schema.get())
       << "Error parsing JSON schema: " << error_code << ": " << error_message;
   DCHECK(schema->IsType(Value::TYPE_DICTIONARY))
       << "schema root must be dictionary.";
 
   JSONSchemaValidator validator(static_cast<DictionaryValue*>(schema.get()));
 
   // We allow extra properties in the schema for easy compat with other systems,
@@ skipping 89 matching lines @@
   web_app->app_url = app_url;
   web_app->urls = urls;
   web_app->permissions = permissions;
   web_app->icons = icons;
 
   return true;
 
 }
 
 }  // namespace web_apps