Commit 8b645f3c authored by Alexander Surkov's avatar Alexander Surkov Committed by Commit Bot

Drop AccessibilityTreeFormatterStub

No value to produce a bare accessible tree on platforms having no accessibility support. Native blink accessibility tree can be used instead

Bug: 1070310
Change-Id: I8aa537a6440e6da34f70defb1b8d72b11a1874e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149500Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Alexander Surkkov <asurkov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#759317}
parent 21831a9f
...@@ -35,7 +35,6 @@ AccessibilityEventRecorder::GetTestPasses() { ...@@ -35,7 +35,6 @@ AccessibilityEventRecorder::GetTestPasses() {
#else // defined(OS_ANDROID) #else // defined(OS_ANDROID)
return { return {
{"blink", &AccessibilityEventRecorder::Create}, {"blink", &AccessibilityEventRecorder::Create},
{"native", &AccessibilityEventRecorder::Create},
}; };
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
} }
......
...@@ -4,34 +4,14 @@ ...@@ -4,34 +4,14 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "content/browser/accessibility/accessibility_tree_formatter_blink.h" #include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
#include "content/browser/accessibility/accessibility_tree_formatter_browser.h"
namespace content { namespace content {
class AccessibilityTreeFormatterStub
: public AccessibilityTreeFormatterBrowser {
public:
explicit AccessibilityTreeFormatterStub();
~AccessibilityTreeFormatterStub() override;
private:
base::FilePath::StringType GetExpectedFileSuffix() override;
const std::string GetAllowEmptyString() override;
const std::string GetAllowString() override;
const std::string GetDenyString() override;
const std::string GetDenyNodeString() override;
void AddProperties(const BrowserAccessibility& node,
base::DictionaryValue* dict) override;
base::string16 ProcessTreeForOutput(
const base::DictionaryValue& node,
base::DictionaryValue* filtered_dict_result = nullptr) override;
};
#if !defined(PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL) #if !defined(PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL)
// static // static
std::unique_ptr<AccessibilityTreeFormatter> std::unique_ptr<AccessibilityTreeFormatter>
AccessibilityTreeFormatter::Create() { AccessibilityTreeFormatter::Create() {
return std::make_unique<AccessibilityTreeFormatterStub>(); return AccessibilityTreeFormatterBlink::CreateBlink();
} }
// static // static
...@@ -39,49 +19,8 @@ std::vector<AccessibilityTreeFormatter::TestPass> ...@@ -39,49 +19,8 @@ std::vector<AccessibilityTreeFormatter::TestPass>
AccessibilityTreeFormatter::GetTestPasses() { AccessibilityTreeFormatter::GetTestPasses() {
return { return {
{"blink", &AccessibilityTreeFormatterBlink::CreateBlink}, {"blink", &AccessibilityTreeFormatterBlink::CreateBlink},
{"native", &AccessibilityTreeFormatter::Create},
}; };
} }
#endif #endif
AccessibilityTreeFormatterStub::AccessibilityTreeFormatterStub()
: AccessibilityTreeFormatterBrowser() {}
AccessibilityTreeFormatterStub::~AccessibilityTreeFormatterStub() {}
void AccessibilityTreeFormatterStub::AddProperties(
const BrowserAccessibility& node,
base::DictionaryValue* dict) {
dict->SetInteger("id", node.GetId());
}
base::string16 AccessibilityTreeFormatterStub::ProcessTreeForOutput(
const base::DictionaryValue& node,
base::DictionaryValue* filtered_dict_result) {
int id_value;
node.GetInteger("id", &id_value);
return base::NumberToString16(id_value);
}
base::FilePath::StringType
AccessibilityTreeFormatterStub::GetExpectedFileSuffix() {
return base::FilePath::StringType();
}
const std::string AccessibilityTreeFormatterStub::GetAllowEmptyString() {
return std::string();
}
const std::string AccessibilityTreeFormatterStub::GetAllowString() {
return std::string();
}
const std::string AccessibilityTreeFormatterStub::GetDenyString() {
return std::string();
}
const std::string AccessibilityTreeFormatterStub::GetDenyNodeString() {
return std::string();
}
} // namespace content } // namespace content
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