a11y inspect reorg: get rid of AccessibilityTreeFormatterBase::DumpAccessibilityTreeFromManager

DumpAccessibilityTreeFromManager is small and has only one consumer: web_contents, which can use tree formatters directly.

Bug: 1133330
Change-Id: I76aba176ec5a240fcfe1b1fe00742ac52880dafe
AX-Relnotes: n/a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532669
Commit-Queue: Alexander Surkov <asurkov@igalia.com>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832341}

content/browser/accessibility/accessibility_tree_formatter_base.cc

@@ -35,22 +35,6 @@ const char kSkipChildren[] = "@NO_CHILDREN_DUMP";
 
 }  // namespace
 
-// static
-std::string AccessibilityTreeFormatterBase::DumpAccessibilityTreeFromManager(
-    BrowserAccessibilityManager* ax_mgr,
-    bool internal,
-    std::vector<AXPropertyFilter> property_filters) {
-  std::unique_ptr<ui::AXTreeFormatter> formatter =
-      internal ? AXInspectFactory::CreateBlinkFormatter()
-               : AXInspectFactory::CreatePlatformFormatter();
-
-  formatter->SetPropertyFilters(property_filters);
-  base::Value dict =
-      static_cast<AccessibilityTreeFormatterBase*>(formatter.get())
-          ->BuildTree(ax_mgr->GetRoot());
-  return formatter->FormatTree(dict);
-}
-
 AccessibilityTreeFormatterBase::AccessibilityTreeFormatterBase() = default;
 
 AccessibilityTreeFormatterBase::~AccessibilityTreeFormatterBase() = default;

content/browser/accessibility/accessibility_tree_formatter_base.h

@@ -41,11 +41,6 @@ class CONTENT_EXPORT AccessibilityTreeFormatterBase
   AccessibilityTreeFormatterBase();
   ~AccessibilityTreeFormatterBase() override;
 
-  static std::string DumpAccessibilityTreeFromManager(
-      BrowserAccessibilityManager* ax_mgr,
-      bool internal,
-      std::vector<AXPropertyFilter> property_filters);
-
   std::string Format(ui::AXPlatformNodeDelegate* root) const override;
 
   // Populates the given DictionaryValue with the accessibility tree.

content/browser/web_contents/web_contents_impl.cc

@@ -50,7 +50,7 @@
 #include "components/rappor/public/rappor_utils.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/browser/accessibility/accessibility_event_recorder.h"
-#include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
+#include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
@@ -4018,8 +4018,13 @@ std::string WebContentsImpl::DumpAccessibilityTree(
   OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::DumpAccessibilityTree");
   auto* ax_mgr = GetOrCreateRootBrowserAccessibilityManager();
   DCHECK(ax_mgr);
-  return AccessibilityTreeFormatterBase::DumpAccessibilityTreeFromManager(
-      ax_mgr, internal, property_filters);
+
+  std::unique_ptr<ui::AXTreeFormatter> formatter =
+      internal ? AXInspectFactory::CreateBlinkFormatter()
+               : AXInspectFactory::CreatePlatformFormatter();
+
+  formatter->SetPropertyFilters(property_filters);
+  return formatter->Format(ax_mgr->GetRoot());
 }
 
 void WebContentsImpl::RecordAccessibilityEvents(