Commit 833f6c9a authored by Nigel Tao's avatar Nigel Tao Committed by Commit Bot

Upgrade ui/accessibility from deprecated Value-conversion API

Bug: 1086733
Change-Id: If2f08ecb345051677ec5dc249fa5e5922229e633
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2235253
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Reviewed-by: default avatarNektarios Paisios <nektar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776899}
parent b6b64964
...@@ -175,7 +175,10 @@ jumbo_component("accessibility") { ...@@ -175,7 +175,10 @@ jumbo_component("accessibility") {
"platform/compute_attributes.h", "platform/compute_attributes.h",
] ]
deps = [ "//third_party/cld_3/src/src:cld_3" ] deps = [
"//base/util/values:values_util",
"//third_party/cld_3/src/src:cld_3",
]
public_deps = [ public_deps = [
":ax_base", ":ax_base",
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/check.h" #include "base/check.h"
#include "base/no_destructor.h" #include "base/no_destructor.h"
#include "base/notreached.h" #include "base/notreached.h"
#include "base/value_conversions.h" #include "base/util/values/values_util.h"
#include "base/values.h" #include "base/values.h"
#include "ui/accessibility/ax_enums.mojom.h" #include "ui/accessibility/ax_enums.mojom.h"
...@@ -30,10 +30,10 @@ AXTreeID::AXTreeID(const std::string& string) { ...@@ -30,10 +30,10 @@ AXTreeID::AXTreeID(const std::string& string) {
type_ = ax::mojom::AXTreeIDType::kUnknown; type_ = ax::mojom::AXTreeIDType::kUnknown;
} else { } else {
type_ = ax::mojom::AXTreeIDType::kToken; type_ = ax::mojom::AXTreeIDType::kToken;
base::Value string_value(string); base::Optional<base::UnguessableToken> token =
base::UnguessableToken token; util::ValueToUnguessableToken(base::Value(string));
CHECK(base::GetValueAsUnguessableToken(string_value, &token)); CHECK(token);
token_ = token; token_ = *token;
} }
} }
...@@ -54,7 +54,7 @@ std::string AXTreeID::ToString() const { ...@@ -54,7 +54,7 @@ std::string AXTreeID::ToString() const {
case ax::mojom::AXTreeIDType::kUnknown: case ax::mojom::AXTreeIDType::kUnknown:
return ""; return "";
case ax::mojom::AXTreeIDType::kToken: case ax::mojom::AXTreeIDType::kToken:
return base::CreateUnguessableTokenValue(*token_).GetString(); return util::UnguessableTokenToValue(*token_).GetString();
} }
NOTREACHED(); NOTREACHED();
......
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