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

chrome/test/webdriver/webdriver_session.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_session.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1453 matching lines @@
       base::Unretained(automation_.get()),
       frame_id.view_id,
       frame_id.frame_path,
       script,
       &response_json,
       &error));
   if (error)
     return error;
 
   scoped_ptr<Value> value(base::JSONReader::ReadAndReturnError(
-      response_json, true, NULL, NULL));
+      response_json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, NULL));
   if (!value.get())
     return new Error(kUnknownError, "Failed to parse script result");
   if (value->GetType() != Value::TYPE_DICTIONARY)
     return new Error(kUnknownError, "Execute script returned non-dict: " +
                          JsonStringify(value.get()));
   DictionaryValue* result_dict = static_cast<DictionaryValue*>(value.get());
 
   int status;
   if (!result_dict->GetInteger("status", &status))
     return new Error(kUnknownError, "Execute script did not return status: " +
@@ skipping 400 matching lines @@
     capabilities_.local_state->GetWithoutPathExpansion(*iter, &value);
     Error* error = SetPreference(*iter, false /* is_user_pref */,
                                  value->DeepCopy());
     if (error)
       return error;
   }
   return NULL;
 }
 
 }  // namespace webdriver