Revert "Extensions: Focus correct button on options dialog close."

This reverts commit 5aa7731c.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 619843 as the
culprit for flakes in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/flake/flake-culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyQwsSDEZsYWtlQ3VscHJpdCIxY2hyb21pdW0vNWFhNzczMWMzMDc1ZmU2M2QxZjAxNjI1MmZjMDk0YmJhMTQ5MWQxNww

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.win/Win10%20Tests%20x64/30552

Sample Failed Step: network_service_browser_tests on Windows-10-15063

Sample Flaky Test: CrExtensionsManagerTestWithOptionsDialog.ShowOptionsDialog

Original change's description:
> Extensions: Focus correct button on options dialog close.
> 
> Also fix some const references surfaced by presubmit.
> 
> Bug: 912026
> Change-Id: I2661f69f0e63e613a9b8e9d565813c3e27fed340
> Reviewed-on: https://chromium-review.googlesource.com/c/1377494
> Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
> Commit-Queue: Hector Carmona <hcarmona@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#619843}

Change-Id: I66ae0de35342e94b47e76dac658df2eb1f12e4b0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 912026, 919007
Reviewed-on: https://chromium-review.googlesource.com/c/1395717
Cr-Commit-Position: refs/heads/master@{#619870}

chrome/browser/resources/md_extensions/detail_view.js

@@ -44,14 +44,6 @@ cr.define('extensions', function() {
       'view-enter-start': 'onViewEnterStart_',
     },
 
-    /**
-     * Focuses the extensions options button. This should be used after the
-     * dialog closes.
-     */
-    focusOptionsButton: function() {
-      this.$$('#extensions-options').focus();
-    },
-
     /**
      * Focuses the back button when page is loaded.
      * @private

chrome/browser/resources/md_extensions/manager.js

@@ -530,7 +530,6 @@ cr.define('extensions', function() {
     /** @private */
     onOptionsDialogClose_: function() {
       this.showOptionsDialog_ = false;
-      this.$$('extensions-detail-view').focusOptionsButton();
     },
 
     /** @private */

chrome/test/data/extensions/options_page_in_view/manifest.json

 {
   "name": "Extension With Options Page",
   "description": "An extension with an options page and an extra page",
-  "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm3v3jAleGUmPIlw9zsz5xfNE0uP41ZguA2nz4sM6Dy477Ve8rLMwqdsDjxDDnHWdIxNsGkXQbP+Yo8jhH/tEc1lo780b5T3Sjj+ULKsW/lunxQV35Q4x5UNs0vryQvVZZCn4euYSn66XtRGIe4+3nq55cw8HgF2Ex3r7jJ3jRzQg0LV9j1JyoibkjwAqxvdYdnHtMvVfJPTo8NoTrFFZbq1qBQTZCvZKIFJX/iwY/ib3AnH+DCnc1jj2mBuoOoNYHuRwYt/7uCmst8UNSr47deNlv4neCh5IIWZjz6AROFRUGFrIcP6s3f1FiOQoGGAD5x7adL2zAsScNqyCm2TczQIDAQAB",
   "options_ui": { "page": "options.html", "open_in_tab": false },
   "version": "0.1.1",
   "manifest_version": 2

chrome/test/data/webui/extensions/cr_extensions_browsertest.js

@@ -63,7 +63,6 @@ CrExtensionsBrowserTestWithInstalledExtension =
   testGenPreamble() {
     GEN('  InstallGoodExtension();');
     GEN('  SetAutoConfirmUninstall();');
-    GEN('  InstallExtensionWithInPageOptions();');
   }
 };
 
@@ -491,32 +490,6 @@ TEST_F(
           extension_manager_tests.TestNames.UrlNavigationToActivityLogFail);
     });
 
-CrExtensionsManagerTestWithOptionsDialog =
-    class extends CrExtensionsBrowserTestWithInstalledExtension {
-  /** @override */
-  get browsePreload() {
-    return 'chrome://extensions/?id=ibbpngabdmdpednkhonkkobdeccpkiff';
-  }
-
-  /** @override */
-  get extraLibraries() {
-    return super.extraLibraries.concat([
-      'manager_test.js',
-    ]);
-  }
-
-  /** @override */
-  get suiteName() {
-    return extension_manager_tests.suiteName;
-  }
-};
-
-TEST_F(
-    'CrExtensionsManagerTestWithOptionsDialog', 'ShowOptionsDialog',
-    function() {
-      this.runMochaTest(extension_manager_tests.TestNames.ShowOptionsDialog);
-    });
-
 CrExtensionsManagerTestWithActivityLogFlag =
     class extends CrExtensionsManagerTestWithIdQueryParam {
   /** @override */

chrome/test/data/webui/extensions/manager_test.js

@@ -14,7 +14,6 @@ cr.define('extension_manager_tests', function() {
         'url navigation to activity log without flag set',
     UrlNavigationToActivityLogSuccess:
         'url navigation to activity log with flag set',
-    ShowOptionsDialog: 'show options dialog',
   };
 
   function getDataByName(list, name) {
@@ -169,50 +168,6 @@ cr.define('extension_manager_tests', function() {
       // Should be re-routed to the main page.
       assertViewActive('extensions-item-list');
     });
-
-    test(assert(TestNames.ShowOptionsDialog), function() {
-      function waitForOptionsDialogToOpen() {
-        return new Promise(resolve => {
-          const dialogOpenListener = () => {
-            const dialog = manager.$$('#options-dialog');
-            assert(dialog);
-            manager.removeEventListener('cr-dialog-open', dialogOpenListener);
-            resolve(dialog);
-          };
-          manager.addEventListener('cr-dialog-open', dialogOpenListener);
-        });
-      }
-
-      function waitForDialogToClose(dialog) {
-        return new Promise(resolve => {
-          // No need to unlisten b/c dialog is removed from DOM after closing.
-          dialog.addEventListener('close', () => {
-            // Allow other events to be handled.
-            window.setTimeout(resolve, 0);
-          });
-        });
-      }
-
-      const extensionDetailView = manager.$$('extensions-detail-view');
-      assertTrue(!!extensionDetailView);
-
-      const optionsButton = extensionDetailView.$$('#extensions-options');
-
-      // Click the options button.
-      optionsButton.click();
-
-      // Wait for dialog to open.
-      return waitForOptionsDialogToOpen()
-          .then(dialog => {
-            // Close dialog and wait.
-            dialog.$.dialog.cancel();
-            return waitForDialogToClose(dialog);
-          })
-          .then(() => {
-            // Validate that this button is focused after dialog closes.
-            assertEquals(optionsButton.$$('button'), getDeepActiveElement());
-          });
-    });
   });
 
   return {