Hook up support for ax::mojom::HasPopup

Unfortunately,
https://chromium-review.googlesource.com/896672

only incompletely hooked up support for this attribute within chrome.automation.

This change completes this hookup.

Test: in various menus with popups, verify AutomationNode.hasPopup is correctly exposed. Furthermore, verify that ChromeVox indicates a menu item has a submenu (e.g. for the Google image labeling submenu).
Change-Id: I44694cccbb827ddb8df5803779adb6b2e1d89034
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1532662Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642731}

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

@@ -493,7 +493,7 @@ Output.RULES = {
           $description $state $restriction`
     },
     menuItem: {
-      speak: `$name $role $if($haspopup, @has_submenu)
+      speak: `$name $role $if($hasPopup, @has_submenu)
           @describe_index($if($posInSet, $posInSet, $indexInParent(menuItem, menuItemCheckBox, menuItemRadio)),
               $if($setSize, $setSize, $parentChildCount(menuItem, menuItemCheckBox, menuItemRadio)))
           $description $state $restriction`
@@ -726,6 +726,8 @@ Output.isTruthy = function(node, attrib) {
   switch (attrib) {
     case 'checked':
       return node.checked && node.checked !== 'false';
+    case 'hasPopup':
+      return node.hasPopup && node.hasPopup !== 'false';
 
     // Chrome automatically calculates these attributes.
     case 'posInSet':

chrome/renderer/extensions/automation_internal_custom_bindings.cc

@@ -1122,6 +1122,16 @@ void AutomationInternalCustomBindings::AddRoutes() {
                                            v8::NewStringType::kNormal)
                        .ToLocalChecked());
       });
+  RouteNodeIDFunction(
+      "GetHasPopup",
+      [](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,
+         AutomationAXTreeWrapper* tree_wrapper, ui::AXNode* node) {
+        ax::mojom::HasPopup has_popup = node->data().GetHasPopup();
+        std::string has_popup_str = ui::ToString(has_popup);
+        result.Set(v8::String::NewFromUtf8(isolate, has_popup_str.c_str(),
+                                           v8::NewStringType::kNormal)
+                       .ToLocalChecked());
+      });
   RouteNodeIDPlusStringBoolFunction(
       "GetNextTextMatch",
       [this](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,

chrome/renderer/resources/extensions/automation/automation_node.js

@@ -349,6 +349,14 @@ var GetStandardActions = natives.GetStandardActions;
 var GetDefaultActionVerb = natives.GetDefaultActionVerb;
 
 
+/**
+ * @param {string} axTreeID The id of the accessibility tree.
+ * @param {number} nodeID The id of a node.
+ * @return {automation.HasPopup}
+ */
+var GetHasPopup = natives.GetHasPopup;
+
+
 /**
  * @param {string} axTreeID The id of the accessibility tree.
  * @param {number} nodeID The id of a node.
@@ -599,6 +607,10 @@ AutomationNodeImpl.prototype = {
     return GetDefaultActionVerb(this.treeID, this.id);
   },
 
+  get hasPopup() {
+    return GetHasPopup(this.treeID, this.id);
+  },
+
   get tableCellColumnHeaders() {
     var ids = GetTableCellColumnHeaders(this.treeID, this.id);
     if (ids && this.rootImpl) {
@@ -1564,6 +1576,7 @@ utils.expose(AutomationNode, AutomationNodeImpl, {
         'role',
         'checked',
         'defaultActionVerb',
+        'hasPopup',
         'restriction',
         'state',
         'location',