Revert of Use setSequentialFocusNavigationStartingPoint in ChromeVox

chrome/browser/resources/chromeos/chromevox/cvox2/background/automation_predicate.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview ChromeVox predicates for the automation extension API.
  */
 
 goog.provide('AutomationPredicate');
 goog.provide('AutomationPredicate.Binary');
@@ skipping 82 matching lines @@
 
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.formField = AutomationPredicate.match({
   anyPredicate: [
     AutomationPredicate.button,
     AutomationPredicate.comboBox,
     AutomationPredicate.editText
   ],
   anyRole: [
     Role.checkBox,
-    Role.colorWell,
     Role.listBox,
     Role.slider,
-    Role.switch,
+    Role.tab,
     Role.tree
   ]
 });
 
-/** @type {AutomationPredicate.Unary} */
-AutomationPredicate.control = AutomationPredicate.match({
-  anyPredicate: [
-    AutomationPredicate.formField,
-  ],
-  anyRole: [
-    Role.disclosureTriangle,
-    Role.menuItem,
-    Role.menuItemCheckBox,
-    Role.menuItemRadio,
-    Role.menuListOption,
-    Role.scrollBar,
-    Role.tab
-  ]
-});
-
-/** @type {AutomationPredicate.Unary} */
-AutomationPredicate.linkOrControl = AutomationPredicate.match({
-  anyPredicate: [
-    AutomationPredicate.control
-  ],
-  anyRole: [
-    Role.link
-  ]
-});
-
 /** @type {AutomationPredicate.Unary} */
 AutomationPredicate.landmark = AutomationPredicate.roles([
     Role.application,
     Role.banner,
     Role.complementary,
     Role.contentInfo,
     Role.form,
     Role.main,
     Role.navigation,
     Role.region,
@@ skipping 305 matching lines @@
  * @param {number} level 1-6
  * @return {AutomationPredicate.Unary}
  */
 AutomationPredicate.makeHeadingPredicate = function(level) {
   return function(node) {
     return node.role == Role.heading && node.hierarchicalLevel == level;
   };
 };
 
 });  // goog.scope