Revert of Enable a11y audit for chrome://settings

chrome/browser/ui/webui/options/options_browsertest.js

 // Copyright (c) 2012 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.
 
-GEN_INCLUDE(['options_browsertest_base.js']);
 GEN('#include "chrome/browser/ui/webui/options/options_browsertest.h"');
 
 /** @const */ var SUPERVISED_USERS_PREF = 'profile.managed_users';
 
 /**
  * Wait for the method specified by |methodName|, on the |object| object, to be
  * called, then execute |afterFunction|.
  * @param {*} object Object with callable property named |methodName|.
  * @param {string} methodName The name of the property on |object| to use as a
  *     callback.
@@ skipping 21 matching lines @@
 }
 
 /**
  * TestFixture for OptionsPage WebUI testing.
  * @extends {testing.Test}
  * @constructor
  */
 function OptionsWebUITest() {}
 
 OptionsWebUITest.prototype = {
-  __proto__: OptionsBrowsertestBase.prototype,
+  __proto__: testing.Test.prototype,
+
+  /** @override */
+  accessibilityIssuesAreErrors: true,
+
+  /** @override */
+  setUp: function() {
+    // user-image-stream is a streaming video element used for capturing a
+    // user image during OOBE.
+    this.accessibilityAuditConfig.ignoreSelectors('videoWithoutCaptions',
+                                                  '.user-image-stream');
+  },
 
   /**
    * Browse to the options page & call our preLoad().
-   * @override
    */
   browsePreload: 'chrome://settings-frame',
 
-  /** @override */
   isAsync: true,
 
   /**
    * Register a mock handler to ensure expectations are met and options pages
    * behave correctly.
    */
   preLoad: function() {
     this.makeAndRegisterMockHandler(
         ['defaultZoomFactorAction',
          'fetchPrefs',
          'observePrefs',
          'setBooleanPref',
          'setIntegerPref',
          'setDoublePref',
          'setStringPref',
          'setObjectPref',
          'clearPref',
          'coreOptionsUserMetricsAction',
         ]);
 
     // Register stubs for methods expected to be called before/during tests.
     // Specific expectations can be made in the tests themselves.
     this.mockHandler.stubs().fetchPrefs(ANYTHING);
     this.mockHandler.stubs().observePrefs(ANYTHING);
     this.mockHandler.stubs().coreOptionsUserMetricsAction(ANYTHING);
   },
 };
 
-/**
- * Wait for overlay-container-1 and overlay-container-2 to be hidden.
- */
-function waitForOverlaysToHide() {
-  var overlay1 = $('overlay-container-1');
-  var overlay2 = $('overlay-container-2');
-
-  document.addEventListener('webkitTransitionEnd', function f(e) {
-    if ((e.target.id == overlay1.id || e.target.id == overlay2.id) &&
-        overlay1.hidden && overlay2.hidden) {
-      document.removeEventListener(f, 'webkitTransitionEnd');
-      testDone();
-    }
-  });
-
-  if (!overlay1.hidden)
-    ensureTransitionEndEvent(overlay1, 500);
-  if (!overlay2.hidden)
-    ensureTransitionEndEvent(overlay2, 500);
-}
-
 // Crashes on Mac only. See http://crbug.com/79181
 GEN('#if defined(OS_MACOSX)');
 GEN('#define MAYBE_testSetBooleanPrefTriggers ' +
     'DISABLED_testSetBooleanPrefTriggers');
 GEN('#else');
 GEN('#define MAYBE_testSetBooleanPrefTriggers testSetBooleanPrefTriggers');
 GEN('#endif  // defined(OS_MACOSX)');
 
 TEST_F('OptionsWebUITest', 'MAYBE_testSetBooleanPrefTriggers', function() {
   // TODO(dtseng): make generic to click all buttons.
@@ skipping 254 matching lines @@
 /**
  * TestFixture for OptionsPage WebUI testing including tab history and support
  * for preference manipulation. If you don't need the features in the C++
  * fixture, use the simpler OptionsWebUITest (above) instead.
  * @extends {testing.Test}
  * @constructor
  */
 function OptionsWebUIExtendedTest() {}
 
 OptionsWebUIExtendedTest.prototype = {
-  __proto__: OptionsWebUITest.prototype,
+  __proto__: testing.Test.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://settings-frame',
 
   /** @override */
   typedefCppFixture: 'OptionsBrowserTest',
 
   testGenPreamble: function() {
     // Start with no supervised users managed by this profile.
     GEN('  ClearPref("' + SUPERVISED_USERS_PREF + '");');
   },
 
+  /** @override */
+  isAsync: true,
+
+  /** @override */
+  setUp: function() {
+      // user-image-stream is a streaming video element used for capturing a
+      // user image during OOBE.
+      this.accessibilityAuditConfig.ignoreSelectors('videoWithoutCaptions',
+                                                    '.user-image-stream');
+  },
+
   /**
    * Asserts that two non-nested arrays are equal. The arrays must contain only
    * plain data types, no nested arrays or other objects.
    * @param {Array} expected An array of expected values.
    * @param {Array} result An array of actual values.
    * @param {boolean} doSort If true, the arrays will be sorted before being
    *     compared.
    * @param {string} description A brief description for the array of actual
    *     values, to use in an error message if the arrays differ.
    * @private
@@ skipping 269 matching lines @@
     PageManager.closeOverlay();
     self.verifyOpenPages_(['settings', 'languages']);
     self.verifyHistory_(
         ['', 'languages', 'addLanguage', 'languages'],
         function() {
       // Close the layer-1 overlay.
       PageManager.closeOverlay();
       self.verifyOpenPages_(['settings'], '');
       self.verifyHistory_(
           ['', 'languages', 'addLanguage', 'languages', ''],
-          waitForOverlaysToHide);
+          testDone);
     });
   });
 });
 
 // Hashes are maintained separately for each page and are preserved when
 // overlays close.
 TEST_F('OptionsWebUIExtendedTest', 'CloseOverlayWithHashes', function() {
   // Open an overlay on top of the search page.
   PageManager.showPageByName('search', true, {hash: '#1'});
   this.verifyOpenPages_(['settings', 'search'], 'search#1');
@@ skipping 11 matching lines @@
     this.verifyOpenPages_(['settings', 'search', 'languages'], 'languages#2');
     this.verifyHistory_(
         ['', 'search#1', 'languages#2', 'addLanguage#3', 'languages#2'],
         function() {
       // Close the layer-1 overlay.
       PageManager.closeOverlay();
       this.verifyOpenPages_(['settings', 'search'], 'search#1');
       this.verifyHistory_(
           ['', 'search#1', 'languages#2', 'addLanguage#3', 'languages#2',
            'search#1'],
-          waitForOverlaysToHide);
+          testDone);
     }.bind(this));
   }.bind(this));
 });
 
 // Test that closing an overlay that did not push history when opening does not
 // again push history.
 TEST_F('OptionsWebUIExtendedTest', 'CloseOverlayNoHistory', function() {
   // Open the do not track confirmation prompt.
   PageManager.showPageByName('doNotTrackConfirm', false);
 
   // Opening the prompt does not add to the history.
   this.verifyHistory_([''], function() {
     // Close the overlay.
     PageManager.closeOverlay();
     // Still no history changes.
-    this.verifyHistory_([''], waitForOverlaysToHide);
+    this.verifyHistory_([''], testDone);
   }.bind(this));
 });
 
 // Make sure an overlay isn't closed (even temporarily) when another overlay is
 // opened on top.
 TEST_F('OptionsWebUIExtendedTest', 'OverlayAboveNoReset', function() {
   // Open a layer-1 overlay.
   PageManager.showPageByName('languages', true);
   this.verifyOpenPages_(['settings', 'languages']);
 
@@ skipping 135 matching lines @@
   __proto__: OptionsWebUIExtendedTest.prototype,
 
   /** @override */
   browsePreload: 'chrome://settings-frame/nonexistantPage',
 };
 
 TEST_F('OptionsWebUIRedirectTest', 'TestURL', function() {
   assertEquals('chrome://settings-frame/', document.location.href);
   this.verifyHistory_([''], testDone);
 });