Name calculation should not include nameFrom:author descendants.

chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/arc/accessibility/ax_tree_source_arc.h"
 
 #include <string>
 
 #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h"
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
@@ skipping 137 matching lines @@
   MAP_ROLE(ui::kAXListViewClassname, ui::AX_ROLE_LIST);
   MAP_ROLE(ui::kAXMenuItemClassname, ui::AX_ROLE_MENU_ITEM);
   MAP_ROLE(ui::kAXPagerClassname, ui::AX_ROLE_SCROLL_AREA);
   MAP_ROLE(ui::kAXProgressBarClassname, ui::AX_ROLE_PROGRESS_INDICATOR);
   MAP_ROLE(ui::kAXRadioButtonClassname, ui::AX_ROLE_RADIO_BUTTON);
   MAP_ROLE(ui::kAXSeekBarClassname, ui::AX_ROLE_SLIDER);
   MAP_ROLE(ui::kAXSpinnerClassname, ui::AX_ROLE_POP_UP_BUTTON);
   MAP_ROLE(ui::kAXSwitchClassname, ui::AX_ROLE_SWITCH);
   MAP_ROLE(ui::kAXTabWidgetClassname, ui::AX_ROLE_TAB_LIST);
   MAP_ROLE(ui::kAXToggleButtonClassname, ui::AX_ROLE_TOGGLE_BUTTON);
-  MAP_ROLE(ui::kAXViewClassname, ui::AX_ROLE_DIV);
+  MAP_ROLE(ui::kAXViewClassname, ui::AX_ROLE_GENERIC_CONTAINER);
   MAP_ROLE(ui::kAXViewGroupClassname, ui::AX_ROLE_GROUP);
   MAP_ROLE(ui::kAXWebViewClassname, ui::AX_ROLE_WEB_VIEW);
 
 #undef MAP_ROLE
 
   std::string text;
   GetStringProperty(node, arc::mojom::AccessibilityStringProperty::TEXT, &text);
   if (!text.empty())
     out_data->role = ui::AX_ROLE_STATIC_TEXT;
   else
-    out_data->role = ui::AX_ROLE_DIV;
+    out_data->role = ui::AX_ROLE_GENERIC_CONTAINER;
 }
 
 void PopulateAXState(arc::mojom::AccessibilityNodeInfoData* node,
                      ui::AXNodeData* out_data) {
 #define MAP_STATE(android_boolean_property, chrome_state) \
   if (GetBooleanProperty(node, android_boolean_property)) \
     out_data->AddState(chrome_state);
 
   using AXBooleanProperty = arc::mojom::AccessibilityBooleanProperty;
 
@@ skipping 231 matching lines @@
   focused_node_id_ = -1;
   extensions::AutomationEventRouter* router =
       extensions::AutomationEventRouter::GetInstance();
   if (!router)
     return;
 
   router->DispatchTreeDestroyedEvent(tree_id(), nullptr);
 }
 
 }  // namespace arc