BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 21 insertions, 6 deletions

diff --git a/chromium/ui/accessibility/ax_table_fuzzer.cc b/chromium/ui/accessibility/ax_table_fuzzer.cc
index 9925f9bf79f..1ee955ee38f 100644
--- a/chromium/ui/accessibility/ax_table_fuzzer.cc
+++ b/chromium/ui/accessibility/ax_table_fuzzer.cc
@@ -98,12 +98,21 @@ void TestTableAPIs(const ui::AXNode* node) {
   // crash. Normally |ids| is an out argument only, but
   // there's no reason we shouldn't be able to pass a vector
   // that was previously used by another call.
-  std::vector<int32_t> ids;
+  std::vector<ui::AXNode::AXID> ids;
   for (int i = 0; i < 3; i++) {
-    node->GetTableColHeaderNodeIds(i, &ids);
-    node->GetTableRowHeaderNodeIds(i, &ids);
+    std::vector<ui::AXNode::AXID> col_header_node_ids =
+        node->GetTableColHeaderNodeIds(i);
+    ids.insert(ids.end(), col_header_node_ids.begin(),
+               col_header_node_ids.end());
+
+    std::vector<ui::AXNode::AXID> row_header_node_ids =
+        node->GetTableRowHeaderNodeIds(i);
+    ids.insert(ids.end(), row_header_node_ids.begin(),
+               row_header_node_ids.end());
   }
-  node->GetTableUniqueCellIds(&ids);
+  std::vector<ui::AXNode::AXID> unique_cell_ids = node->GetTableUniqueCellIds();
+  ids.insert(ids.end(), unique_cell_ids.begin(), unique_cell_ids.end());
+
   ignore_result(node->IsTableRow());
   ignore_result(node->GetTableRowRowIndex());
 #if defined(OS_MACOSX)
@@ -118,8 +127,14 @@ void TestTableAPIs(const ui::AXNode* node) {
   ignore_result(node->GetTableCellRowSpan());
   ignore_result(node->GetTableCellAriaColIndex());
   ignore_result(node->GetTableCellAriaRowIndex());
-  node->GetTableCellColHeaderNodeIds(&ids);
-  node->GetTableCellRowHeaderNodeIds(&ids);
+  std::vector<ui::AXNode::AXID> cell_col_header_node_ids =
+      node->GetTableCellColHeaderNodeIds();
+  ids.insert(ids.end(), cell_col_header_node_ids.begin(),
+             cell_col_header_node_ids.end());
+  std::vector<ui::AXNode::AXID> cell_row_header_node_ids =
+      node->GetTableCellRowHeaderNodeIds();
+  ids.insert(ids.end(), cell_row_header_node_ids.begin(),
+             cell_row_header_node_ids.end());
   std::vector<ui::AXNode*> headers;
   node->GetTableCellColHeaders(&headers);
   node->GetTableCellRowHeaders(&headers);