1 files changed, 3 insertions, 29 deletions

diff --git a/chromium/ui/accessibility/ax_event_generator.cc b/chromium/ui/accessibility/ax_event_generator.cc
index e8135a1f6b6..c36911b1552 100644
--- a/chromium/ui/accessibility/ax_event_generator.cc
+++ b/chromium/ui/accessibility/ax_event_generator.cc
@@ -745,11 +745,6 @@ void AXEventGenerator::OnTreeDataChanged(AXTree* tree,
   DCHECK_EQ(tree_, tree);
   DCHECK(tree->root());
 
-  if (new_tree_data.loaded && !old_tree_data.loaded &&
-      ShouldFireLoadEvents(tree->root())) {
-    AddEvent(tree->root(), Event::LOAD_COMPLETE);
-  }
-
   if (new_tree_data.title != old_tree_data.title)
     AddEvent(tree->root(), Event::DOCUMENT_TITLE_CHANGED);
 
@@ -775,7 +770,7 @@ void AXEventGenerator::OnTreeDataChanged(AXTree* tree,
       // fields, an event should still fire on the field where the selection
       // ends.
       if (AXNode* text_field = selection_focus->GetTextFieldAncestor())
-        AddEvent(text_field, Event::SELECTION_IN_TEXT_FIELD_CHANGED);
+        AddEvent(text_field, Event::TEXT_SELECTION_CHANGED);
     }
   }
 }
@@ -821,13 +816,6 @@ void AXEventGenerator::OnAtomicUpdateFinished(
   DCHECK_EQ(tree_, tree);
   DCHECK(tree->root());
 
-  if (root_changed && ShouldFireLoadEvents(tree->root())) {
-    if (tree->data().loaded)
-      AddEvent(tree->root(), Event::LOAD_COMPLETE);
-    else
-      AddEvent(tree->root(), Event::LOAD_START);
-  }
-
   for (const auto& change : changes) {
     DCHECK(change.node);
 
@@ -974,16 +962,6 @@ void AXEventGenerator::FireRelationSourceEvents(AXTree* tree,
       });
 }
 
-// Attempts to suppress load-related events that we presume no AT will be
-// interested in under any circumstances, such as pages which have no size.
-bool AXEventGenerator::ShouldFireLoadEvents(AXNode* node) {
-  if (always_fire_load_complete_)
-    return true;
-
-  return node->data().relative_bounds.bounds.width() ||
-         node->data().relative_bounds.bounds.height();
-}
-
 void AXEventGenerator::TrimEventsDueToAncestorIgnoredChanged(
     AXNode* node,
     std::map<AXNode*, IgnoredChangedStatesBitset>&
@@ -1310,10 +1288,6 @@ const char* ToString(AXEventGenerator::Event event) {
       return "liveRelevantChanged";
     case AXEventGenerator::Event::LIVE_STATUS_CHANGED:
       return "liveStatusChanged";
-    case AXEventGenerator::Event::LOAD_COMPLETE:
-      return "loadComplete";
-    case AXEventGenerator::Event::LOAD_START:
-      return "loadStart";
     case AXEventGenerator::Event::MENU_ITEM_SELECTED:
       return "menuItemSelected";
     case ui::AXEventGenerator::Event::MENU_POPUP_END:
@@ -1366,8 +1340,8 @@ const char* ToString(AXEventGenerator::Event event) {
       return "selectedChildrenChanged";
     case AXEventGenerator::Event::SELECTED_VALUE_CHANGED:
       return "selectedValueChanged";
-    case AXEventGenerator::Event::SELECTION_IN_TEXT_FIELD_CHANGED:
-      return "selectionInTextFieldChanged";
+    case AXEventGenerator::Event::TEXT_SELECTION_CHANGED:
+      return "textSelectionChanged";
     case AXEventGenerator::Event::SET_SIZE_CHANGED:
       return "setSizeChanged";
     case AXEventGenerator::Event::SORT_CHANGED: