Local NTP: preserve focus when removing suggestions

R=hcarmona@chromium.org

Fixed: 1012997
Change-Id: I6b5c1cf5b740777b521034920fd56455f85e4293
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1851285
Auto-Submit: Dan Beam <dbeam@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704871}

chrome/browser/resources/local_ntp/local_ntp.js

@@ -1083,15 +1083,28 @@ function onDeleteAutocompleteMatch(result) {
     return matchEl.classList.contains(CLASSES.SELECTED);
   });
 
+  const wasFocused = matchEls[selected].contains(document.activeElement);
+
   populateAutocompleteMatches(result.matches);
 
   if (result.matches.length === 0) {
+    if (wasFocused) {
+      $(IDS.REALBOX).focus();
+    }
     return;
   }
 
   const newMatchEls = Array.from($(IDS.REALBOX_MATCHES).children);
   const newSelected = Math.min(newMatchEls.length - 1, selected);
-  selectMatchEl(newMatchEls[newSelected]);
+  const newSelectedEl = newMatchEls[newSelected];
+
+  selectMatchEl(newSelectedEl);
+
+  if (wasFocused) {
+    const removeIcon = newSelectedEl.querySelector(`.${CLASSES.REMOVE_ICON}`);
+    assert(removeIcon || newSelectedEl).focus();
+  }
+
   updateRealboxOutput({
     moveCursorToEnd: true,
     inline: '',

chrome/test/data/local_ntp/realbox_browsertest.js

@@ -564,10 +564,15 @@ test.realbox.testSupportedDeletion = function() {
   assertEquals(1, test.realbox.deletedLines.length);
   assertEquals(1, test.realbox.deletedLines[0]);
 
+  matchesEl.children[1].focus();
+  assertEquals(matchesEl.children[1], document.activeElement);
+
   chrome.embeddedSearch.searchBox.ondeleteautocompletematch(
       {success: true, matches: [test.realbox.getSearchMatch()]});
 
-  assertEquals(1, $(test.realbox.IDS.REALBOX_MATCHES).children.length);
+  const newMatchesEl = $(test.realbox.IDS.REALBOX_MATCHES);
+  assertEquals(1, newMatchesEl.children.length);
+  assertEquals(newMatchesEl.children[0], document.activeElement);
 };
 
 test.realbox.testRemoveIcon = function() {