Merge dom node and node unit types.

chrome/browser/resources/chromeos/chromevox/cvox2/background/cursors_test.extjs

 // 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.
 
 // Include test fixture.
 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
 
 /**
  * Test fixture for cvox2.cursors.
  * @constructor
@@ skipping 13 matching lines @@
   RANGE: 'range',
 
   /** @override */
   setUp: function() {
     // Various aliases.
     window.BACKWARD = constants.Dir.BACKWARD;
     window.FORWARD = constants.Dir.FORWARD;
     window.CHARACTER = cursors.Unit.CHARACTER;
     window.WORD = cursors.Unit.WORD;
     window.LINE = cursors.Unit.LINE;
-    window.DOM_NODE = cursors.Unit.DOM_NODE;
+    window.NODE = cursors.Unit.NODE;
     window.BOUND = cursors.Movement.BOUND;
     window.DIRECTIONAL = cursors.Movement.DIRECTIONAL;
   },
 
   /**
    * Performs a series of operations on a cursor and asserts the result.
    * @param {cursors.Cursor} cursor The starting cursor.
    * @param {!Array<Array<
    *     cursors.Unit|
    *     cursors.Movement|
@@ skipping 229 matching lines @@
       [LINE, BACKWARD,
           {value: 'start ', index: 0}, {value: 'same line', index: 9}]
   ], this.RANGE);
 });
 
 TEST_F('CursorsTest', 'DontSplitOnNodeNavigation', function() {
   this.runWithLoadedTree(this.multiInlineDoc, function(root) {
     var para = root.firstChild;
     assertEquals('paragraph', para.role);
     var cursor = new cursors.Cursor(para.firstChild, 0);
-    cursor = cursor.move(DOM_NODE, DIRECTIONAL, FORWARD);
+    cursor = cursor.move(NODE, DIRECTIONAL, FORWARD);
     assertEquals('staticText', cursor.node.role);
     assertEquals('end', cursor.node.name);
 
-    cursor = cursor.move(DOM_NODE, DIRECTIONAL, BACKWARD);
+    cursor = cursor.move(NODE, DIRECTIONAL, BACKWARD);
     assertEquals('staticText', cursor.node.role);
     assertEquals('start diff line', cursor.node.name);
     
     assertEquals('inlineTextBox', cursor.node.firstChild.role);
     assertEquals('start ', cursor.node.firstChild.name);
     assertEquals('diff ', cursor.node.firstChild.nextSibling.name);
     assertEquals('line', cursor.node.lastChild.name);
   });
 });
 
 TEST_F('CursorsTest', 'WrappingCursors', function() {
   this.runWithLoadedTree(this.multiInlineDoc, function(root) {
     var first = root;
     var last = root.lastChild.firstChild;
     var cursor = new cursors.WrappingCursor(first, -1);
 
     // Wrap from first node to last node.
-    cursor = cursor.move(DOM_NODE, DIRECTIONAL, BACKWARD);
+    cursor = cursor.move(NODE, DIRECTIONAL, BACKWARD);
     assertEquals(last, cursor.node);
 
     // Wrap from last node to first node.
-    cursor = cursor.move(DOM_NODE, DIRECTIONAL, FORWARD);
+    cursor = cursor.move(NODE, DIRECTIONAL, FORWARD);
     assertEquals(first, cursor.node);
   });
 });
 
 TEST_F('CursorsTest', 'IsInWebRange', function() {
   this.runWithLoadedTree(this.simpleDoc, function(root) {
     var para = root.firstChild;
     var webRange = new cursors.Range.fromNode(para);
     var auraRange = cursors.Range.fromNode(root.parent);
     assertFalse(auraRange.isWebRange());
@@ skipping 61 matching lines @@
     // Now, try selecting via node offsets.
     var cursor = new cursors.Cursor(root.firstChild, -1);
     assertEquals(root, cursor.selectionNode_);
     assertEquals(0, cursor.selectionIndex_);
 
     cursor = new cursors.Cursor(root.firstChild.nextSibling, -1);
     assertEquals(root, cursor.selectionNode_);
     assertEquals(1, cursor.selectionIndex_);
   });
 });