[Merge to M53] Fix a regression in the keyboard overlay go back/forward shortcuts

chrome/browser/resources/chromeos/keyboard_overlay.js

Index: chrome/browser/resources/chromeos/keyboard_overlay.js
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay.js b/chrome/browser/resources/chromeos/keyboard_overlay.js
index 1d4c9b9ab426f8d892470a28c13d971c2ddfaf56..dc6e05ad97e0f5886ae7afe3b33d2058ce670797 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.js
@@ -212,6 +212,14 @@ function getShortcutData() {
     delete shortcutDataCache['0<>CTRL<>SHIFT'];
   }
 
+  if (!loadTimeData.getBoolean('backspaceGoesBackFeatureEnabled')) {
+    // If the "backspace key goes back" experiment is not enabled, then we
+    // clear the shortcuts for Backspace and Shift+Backspace to go back or
+    // forward respectively.
+    delete shortcutDataCache['backspace'];
+    delete shortcutDataCache['backspace<>SHIFT'];
+  }
+
   return shortcutDataCache;
 }
 
@@ -555,15 +563,6 @@ function update(modifiers, normModifiers) {
 
     classes.push('keyboard-overlay-key-background');
 
-    if ((shortcutId == 'keyboardOverlayGoBack' ||
-         shortcutId == 'keyboardOverlayGoForward') &&
-        !loadTimeData.getBoolean('backspaceGoesBackFeatureEnabled')) {
-      // If the "backspace key goes back" experiment is not enabled, then we
-      // clear the shortcuts for Backspace and Shift+Backspace to go back or
-      // forward respectively.
-      shortcutId = null;
-    }
-
     if (shortcutId) {
       classes.push('is-shortcut');
       classes.push('keyboard-overlay-shortcut-key-background');