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

chrome/test/automation/automation_json_requests.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/test/automation/automation_json_requests.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
@@ skipping 28 matching lines @@
   bool success = false;
   if (!SendAutomationJSONRequestWithDefaultTimeout(
           sender, request, &reply, &success)) {
     *error = Error(base::StringPrintf(
         "Chrome did not respond to '%s'. Elapsed time was %" PRId64 " ms.",
         command.c_str(),
         (base::Time::Now() - before_sending).InMilliseconds()));
     LOG(INFO) << error->message();
     return false;
   }
-  scoped_ptr<Value> value(base::JSONReader::Read(reply, true));
+  scoped_ptr<Value> value(
+      base::JSONReader::Read(reply, base::JSON_ALLOW_TRAILING_COMMAS));
   if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
     *error = Error("JSON request did not return a dictionary");
     LOG(ERROR) << "JSON request did not return dict: " << command << "\n";
     return false;
   }
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!success) {
     std::string error_msg;
     dict->GetString("error", &error_msg);
     int int_code = automation::kUnknownError;
@@ skipping 833 matching lines @@
     Error* error) {
   DictionaryValue dict;
   dict.SetString("command", "SetPrefs");
   // TODO(kkania): Set correct auto_id instead of hardcoding windex.
   dict.SetInteger("windex", 0);
   dict.SetString("path", pref);
   dict.Set("value", value);
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, dict, &reply_dict, error);
 }