DumpAccTree testsuite: convert utf16 to utf8 in AccessibilityTreeFormatter::ProcessTreeForOutput

Bug: 1115489
Change-Id: I6e63b50875abf7ee1296b72818c23d0c20cd2009
AX-Relnotes: n/a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2365977
Commit-Queue: Alexander Surkov <asurkov@igalia.com>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803856}

content/browser/accessibility/accessibility_tree_formatter_android.cc

@@ -112,7 +112,7 @@ class AccessibilityTreeFormatterAndroid
   void AddProperties(const BrowserAccessibility& node,
                      base::DictionaryValue* dict) const;
 
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) override;
 };
@@ -268,14 +268,14 @@ void AccessibilityTreeFormatterAndroid::AddProperties(
   dict->SetBoolean("action_scroll_right", android_node->CanScrollRight());
 }
 
-base::string16 AccessibilityTreeFormatterAndroid::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterAndroid::ProcessTreeForOutput(
     const base::DictionaryValue& dict,
     base::DictionaryValue* filtered_dict_result) {
-  base::string16 error_value;
+  std::string error_value;
   if (dict.GetString("error", &error_value))
     return error_value;
 
-  base::string16 line;
+  std::string line;
   if (show_ids()) {
     int id_value;
     dict.GetInteger("id", &id_value);

content/browser/accessibility/accessibility_tree_formatter_auralinux.cc

@@ -38,7 +38,7 @@ class AccessibilityTreeFormatterAuraLinux
   const std::string GetDenyNodeString() override;
   const std::string GetRunUntilEventString() override;
 
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) override;
 
@@ -614,14 +614,14 @@ const char* const ATK_OBJECT_ATTRIBUTES[] = {
     "xml-roles",
 };
 
-base::string16 AccessibilityTreeFormatterAuraLinux::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterAuraLinux::ProcessTreeForOutput(
     const base::DictionaryValue& node,
     base::DictionaryValue* filtered_dict_result) {
-  base::string16 error_value;
+  std::string error_value;
   if (node.GetString("error", &error_value))
     return error_value;
 
-  base::string16 line;
+  std::string line;
   std::string role_value;
   node.GetString("role", &role_value);
   if (!role_value.empty()) {

content/browser/accessibility/accessibility_tree_formatter_base.cc

@@ -403,7 +403,7 @@ void AccessibilityTreeFormatterBase::RecursiveFormatAccessibilityTree(
     return;
 
   std::string indent = std::string(depth * kIndentSymbolCount, kIndentSymbol);
-  std::string line = indent + base::UTF16ToUTF8(ProcessTreeForOutput(dict));
+  std::string line = indent + ProcessTreeForOutput(dict);
   if (line.find(kSkipString) != std::string::npos)
     return;
 
@@ -525,14 +525,14 @@ std::string AccessibilityTreeFormatterBase::FormatRectangle(
 
 bool AccessibilityTreeFormatterBase::WriteAttribute(bool include_by_default,
                                                     const std::string& attr,
-                                                    base::string16* line) {
+                                                    std::string* line) {
   if (attr.empty())
     return false;
   if (!MatchesPropertyFilters(attr, include_by_default))
     return false;
   if (!line->empty())
-    *line += base::ASCIIToUTF16(" ");
-  *line += base::UTF8ToUTF16(attr);
+    *line += " ";
+  *line += attr;
   return true;
 }
 

content/browser/accessibility/accessibility_tree_formatter_base.h

@@ -168,7 +168,7 @@ class CONTENT_EXPORT AccessibilityTreeFormatterBase
   // - Returns a filtered text view as one large string.
   // - Provides a filtered version of the dictionary in an out param,
   //   (only if the out param is provided).
-  virtual base::string16 ProcessTreeForOutput(
+  virtual std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) = 0;
 
@@ -193,7 +193,7 @@ class CONTENT_EXPORT AccessibilityTreeFormatterBase
   // Returns false if the attribute was filtered out.
   bool WriteAttribute(bool include_by_default,
                       const std::string& attr,
-                      base::string16* line);
+                      std::string* line);
   void AddPropertyFilter(std::vector<PropertyFilter>* property_filters,
                          std::string filter,
                          PropertyFilter::Type type = PropertyFilter::ALLOW);

content/browser/accessibility/accessibility_tree_formatter_blink.cc

@@ -413,14 +413,14 @@ void AccessibilityTreeFormatterBlink::AddProperties(
     dict->SetString("actions", base::JoinString(actions_strings, ","));
 }
 
-base::string16 AccessibilityTreeFormatterBlink::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterBlink::ProcessTreeForOutput(
     const base::DictionaryValue& dict,
     base::DictionaryValue* filtered_dict_result) {
-  base::string16 error_value;
+  std::string error_value;
   if (dict.GetString("error", &error_value))
     return error_value;
 
-  base::string16 line;
+  std::string line;
 
   if (show_ids()) {
     int id_value;

content/browser/accessibility/accessibility_tree_formatter_blink.h

@@ -54,7 +54,7 @@ class CONTENT_EXPORT AccessibilityTreeFormatterBlink
   void AddProperties(const BrowserAccessibility& node,
                      base::DictionaryValue* dict) const;
 
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) override;
 };

content/browser/accessibility/accessibility_tree_formatter_mac.mm

@@ -102,7 +102,7 @@ class AccessibilityTreeFormatterMac : public AccessibilityTreeFormatterBase {
 
   std::string NodeToLineIndex(id, const LineIndexesMap&) const;
 
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) override;
 
@@ -390,14 +390,14 @@ std::string AccessibilityTreeFormatterMac::NodeToLineIndex(
   return kConstValuePrefix + line_indexes_map.IndexBy(cocoa_node);
 }
 
-base::string16 AccessibilityTreeFormatterMac::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterMac::ProcessTreeForOutput(
     const base::DictionaryValue& dict,
     base::DictionaryValue* filtered_dict_result) {
-  base::string16 error_value;
+  std::string error_value;
   if (dict.GetString("error", &error_value))
     return error_value;
 
-  base::string16 line;
+  std::string line;
 
   // AXRole and AXSubrole have own formatting and should be listed upfront.
   std::string role_attr = SysNSStringToUTF8(NSAccessibilityRoleAttribute);

content/browser/accessibility/accessibility_tree_formatter_uia_win.cc

@@ -36,8 +36,8 @@
 
 namespace {
 
-base::string16 UiaIdentifierToCondensedString16(int32_t id) {
-  base::string16 identifier = content::UiaIdentifierToString(id);
+std::string UiaIdentifierToCondensedString(int32_t id) {
+  std::string identifier = content::UiaIdentifierToStringUTF8(id);
   if (id >= UIA_RuntimeIdPropertyId && id <= UIA_HeadingLevelPropertyId) {
     // remove leading 'UIA_' and trailing 'PropertyId'
     return identifier.substr(4, identifier.size() - 14);
@@ -49,10 +49,6 @@ base::string16 UiaIdentifierToCondensedString16(int32_t id) {
   return identifier;
 }
 
-std::string UiaIdentifierToCondensedString(int32_t id) {
-  return base::UTF16ToUTF8(UiaIdentifierToCondensedString16(id));
-}
-
 }  // namespace
 
 namespace content {
@@ -880,7 +876,7 @@ void AccessibilityTreeFormatterUia::WriteI4Property(
   switch (propertyId) {
     case UIA_ControlTypePropertyId:
       dict->SetString(UiaIdentifierToCondensedString(propertyId),
-                      UiaIdentifierToCondensedString16(lval));
+                      UiaIdentifierToCondensedString(lval));
       break;
     case UIA_OrientationPropertyId:
       dict->SetString(UiaIdentifierToCondensedString(propertyId),
@@ -1024,11 +1020,11 @@ void AccessibilityTreeFormatterUia::BuildCacheRequests() {
   }
 }
 
-base::string16 AccessibilityTreeFormatterUia::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterUia::ProcessTreeForOutput(
     const base::DictionaryValue& dict,
     base::DictionaryValue* filtered_result) {
   std::unique_ptr<base::DictionaryValue> tree;
-  base::string16 line;
+  std::string line;
 
   // Always show control type, and show it first.
   std::string control_type_value;
@@ -1088,7 +1084,7 @@ base::string16 AccessibilityTreeFormatterUia::ProcessTreeForOutput(
 void AccessibilityTreeFormatterUia::ProcessPropertyForOutput(
     const std::string& property_name,
     const base::DictionaryValue& dict,
-    base::string16& line,
+    std::string& line,
     base::DictionaryValue* filtered_result) {
   //
   const base::Value* value;
@@ -1099,7 +1095,7 @@ void AccessibilityTreeFormatterUia::ProcessPropertyForOutput(
 void AccessibilityTreeFormatterUia::ProcessValueForOutput(
     const std::string& name,
     const base::Value* value,
-    base::string16& line,
+    std::string& line,
     base::DictionaryValue* filtered_result) {
   switch (value->type()) {
     case base::Value::Type::STRING: {

content/browser/accessibility/accessibility_tree_formatter_uia_win.h

@@ -101,16 +101,16 @@ class AccessibilityTreeFormatterUia : public AccessibilityTreeFormatterBase {
   const std::string GetDenyString() override;
   const std::string GetDenyNodeString() override;
   const std::string GetRunUntilEventString() override;
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_result = nullptr) override;
   void ProcessPropertyForOutput(const std::string& property_name,
                                 const base::DictionaryValue& dict,
-                                base::string16& line,
+                                std::string& line,
                                 base::DictionaryValue* filtered_result);
   void ProcessValueForOutput(const std::string& name,
                              const base::Value* value,
-                             base::string16& line,
+                             std::string& line,
                              base::DictionaryValue* filtered_result);
   Microsoft::WRL::ComPtr<IUIAutomation> uia_;
   Microsoft::WRL::ComPtr<IUIAutomationCacheRequest> element_cache_request_;

content/browser/accessibility/accessibility_tree_formatter_win.cc

@@ -96,7 +96,7 @@ class AccessibilityTreeFormatterWin : public AccessibilityTreeFormatterBase {
                                  base::DictionaryValue* dict);
   void AddIA2ValueProperties(const Microsoft::WRL::ComPtr<IAccessible>,
                              base::DictionaryValue* dict);
-  base::string16 ProcessTreeForOutput(
+  std::string ProcessTreeForOutput(
       const base::DictionaryValue& node,
       base::DictionaryValue* filtered_dict_result = nullptr) override;
 };
@@ -913,10 +913,10 @@ void AccessibilityTreeFormatterWin::AddIA2ValueProperties(
   }
 }
 
-base::string16 AccessibilityTreeFormatterWin::ProcessTreeForOutput(
+std::string AccessibilityTreeFormatterWin::ProcessTreeForOutput(
     const base::DictionaryValue& dict,
     base::DictionaryValue* filtered_dict_result) {
-  base::string16 line;
+  std::string line;
 
   // Always show role, and show it first.
   std::string role_value;