Commit 94acc4dc authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Upgrade timezone from deprecated base::JSONReader API

Bug: 1070409
Change-Id: I5b2158a0af43c64055c3ea60dd74f490e579548f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2222070Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773912}
parent 7bd3c532
...@@ -180,23 +180,23 @@ bool ParseServerResponse(const GURL& server_url, ...@@ -180,23 +180,23 @@ bool ParseServerResponse(const GURL& server_url,
<< response_body; << response_body;
// Parse the response, ignoring comments. // Parse the response, ignoring comments.
std::string error_msg; base::JSONReader::ValueWithError parsed_json =
std::unique_ptr<base::Value> response_value = base::JSONReader::ReadAndReturnValueWithError(response_body);
base::JSONReader::ReadAndReturnErrorDeprecated( if (!parsed_json.value) {
response_body, base::JSON_PARSE_RFC, NULL, &error_msg); PrintTimeZoneError(server_url,
if (response_value == NULL) { "JSONReader failed: " + parsed_json.error_message,
PrintTimeZoneError(server_url, "JSONReader failed: " + error_msg, timezone); timezone);
RecordUmaEvent(TIMEZONE_REQUEST_EVENT_RESPONSE_MALFORMED); RecordUmaEvent(TIMEZONE_REQUEST_EVENT_RESPONSE_MALFORMED);
return false; return false;
} }
const base::DictionaryValue* response_object = NULL; const base::DictionaryValue* response_object = NULL;
if (!response_value->GetAsDictionary(&response_object)) { if (!parsed_json.value->GetAsDictionary(&response_object)) {
PrintTimeZoneError( PrintTimeZoneError(
server_url, server_url,
"Unexpected response type : " + "Unexpected response type : " +
base::StringPrintf( base::StringPrintf(
"%u", static_cast<unsigned int>(response_value->type())), "%u", static_cast<unsigned int>(parsed_json.value->type())),
timezone); timezone);
RecordUmaEvent(TIMEZONE_REQUEST_EVENT_RESPONSE_MALFORMED); RecordUmaEvent(TIMEZONE_REQUEST_EVENT_RESPONSE_MALFORMED);
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment