Commit e8e7b466 authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Upgrade chrome/common from deprecated Value-conversion API

Bug: 1086733
Change-Id: If34d48c06619639470ba27de8ba003591219766a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2235134Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Nigel Tao <nigeltao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776352}
parent af727823
...@@ -178,6 +178,7 @@ static_library("common") { ...@@ -178,6 +178,7 @@ static_library("common") {
"//base", "//base",
"//base:base_static", "//base:base_static",
"//base:i18n", "//base:i18n",
"//base/util/values:values_util",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
"//chrome/app/theme:theme_resources", "//chrome/app/theme:theme_resources",
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "base/macros.h" #include "base/macros.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/value_conversions.h" #include "base/util/values/values_util.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "content/public/common/origin_util.h" #include "content/public/common/origin_util.h"
#include "extensions/common/constants.h" #include "extensions/common/constants.h"
...@@ -86,10 +86,11 @@ ProtocolHandler ProtocolHandler::CreateProtocolHandler( ...@@ -86,10 +86,11 @@ ProtocolHandler ProtocolHandler::CreateProtocolHandler(
base::Time time; base::Time time;
value->GetString("protocol", &protocol); value->GetString("protocol", &protocol);
value->GetString("url", &url); value->GetString("url", &url);
const base::Value* time_value = value->FindKey("last_modified"); base::Optional<base::Time> time_value =
util::ValueToTime(value->FindKey("last_modified"));
// Treat invalid times as the default value. // Treat invalid times as the default value.
if (time_value) if (time_value)
ignore_result(base::GetValueAsTime(*time_value, &time)); time = *time_value;
return ProtocolHandler(protocol, GURL(url), time); return ProtocolHandler(protocol, GURL(url), time);
} }
...@@ -105,7 +106,7 @@ std::unique_ptr<base::DictionaryValue> ProtocolHandler::Encode() const { ...@@ -105,7 +106,7 @@ std::unique_ptr<base::DictionaryValue> ProtocolHandler::Encode() const {
auto d = std::make_unique<base::DictionaryValue>(); auto d = std::make_unique<base::DictionaryValue>();
d->SetString("protocol", protocol_); d->SetString("protocol", protocol_);
d->SetString("url", url_.spec()); d->SetString("url", url_.spec());
d->SetKey("last_modified", base::CreateTimeValue(last_modified_)); d->SetKey("last_modified", util::TimeToValue(last_modified_));
return d; return d;
} }
......
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