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

Unified Diff: chrome/test/automation/browser_proxy.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/automation/browser_proxy.cc
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc
index 66a4b0af102e96107b366c4f7a858b9e0ad38dfb..4c2dae9e121eeb3d9764e2c8d73a92e145578e06 100644
--- a/chrome/test/automation/browser_proxy.cc
+++ b/chrome/test/automation/browser_proxy.cc
@@ -605,9 +605,8 @@ bool BrowserProxy::GetInitialLoadTimes(int timeout_ms,
return false;
}
std::string error;
- base::JSONReader reader;
- scoped_ptr<Value> values(reader.ReadAndReturnError(json_response, true,
- NULL, &error));
+ scoped_ptr<Value> values(base::JSONReader::ReadAndReturnError(
+ json_response, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error));
if (!error.empty() || values->GetType() != Value::TYPE_DICTIONARY)
return false;

Powered by Google App Engine
This is Rietveld 408576698