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

chrome/test/webdriver/webdriver_dispatch.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/webdriver/webdriver_dispatch.h"
 
 #include <sstream>
 #include <string>
 #include <vector>
 
@@ skipping 302 matching lines @@
   uri = uri.substr(manager->url_base().length());
 
   base::SplitString(uri, '/', path_segments);
 
   if (*method == "POST") {
     std::string json;
     ReadRequestBody(request_info, connection, &json);
     if (json.length() > 0) {
       std::string error_msg;
       scoped_ptr<Value> params(base::JSONReader::ReadAndReturnError(
-          json, true, NULL, &error_msg));
+          json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg));
       if (!params.get()) {
         response->SetError(new Error(
             kBadRequest,
             "Failed to parse command data: " + error_msg +
                 "\n  Data: " + json));
         return false;
       }
       if (!params->IsType(Value::TYPE_DICTIONARY)) {
         response->SetError(new Error(
             kBadRequest,
@@ skipping 84 matching lines @@
        ++callback) {
     if (MatchPattern(request_info->uri, callback->uri_regex_)) {
       callback->func_(connection, request_info, callback->user_data_);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace webdriver