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

chrome/browser/plugin_finder.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/browser/plugin_finder.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 33 matching lines @@
 // static
 scoped_ptr<DictionaryValue> PluginFinder::LoadPluginList() {
   return scoped_ptr<DictionaryValue>(LoadPluginListInternal());
 }
 
 DictionaryValue* PluginFinder::LoadPluginListInternal() {
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
   base::StringPiece json_resource(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_PLUGIN_DB_JSON));
-  bool allow_trailing_comma = false;
   std::string error_str;
   scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
       json_resource.as_string(),
-      allow_trailing_comma,
+      base::JSON_PARSE_RFC,
       NULL,
       &error_str));
   if (!value.get()) {
     DLOG(ERROR) << error_str;
     return NULL;
   }
   if (value->GetType() != base::Value::TYPE_DICTIONARY)
     return NULL;
   return static_cast<base::DictionaryValue*>(value.release());
 #else
@@ skipping 72 matching lines @@
   plugin_dict->GetBoolean("requires_authorization", &requires_authorization);
   PluginInstaller* installer = new PluginInstaller(identifier,
                                                    GURL(url),
                                                    GURL(help_url),
                                                    name,
                                                    display_url,
                                                    requires_authorization);
   installers_[identifier] = installer;
   return installer;
 }