Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8480)

Unified Diff: chrome/test/webdriver/webdriver_session.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/webdriver/webdriver_session.cc
diff --git a/chrome/test/webdriver/webdriver_session.cc b/chrome/test/webdriver/webdriver_session.cc
index 6faabd6f95e33c377700c94a8e52819552a79bd9..af17a5c982ded49a7d38b775f148579bad7bcb44 100644
--- a/chrome/test/webdriver/webdriver_session.cc
+++ b/chrome/test/webdriver/webdriver_session.cc
@@ -1471,7 +1471,7 @@ Error* Session::ExecuteScriptAndParseValue(const FrameId& frame_id,
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)

Powered by Google App Engine
This is Rietveld 408576698