Refactorings to reduce dependencies in ChromeVox 2.

chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs

 // 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_unittest_base.js',
             '../testing/assert_additions.js']);
 
 /**
  * Test fixture.
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
 function CvoxExpandingBrailleTranslatorUnitTest() {}
 
 CvoxExpandingBrailleTranslatorUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
   closureModuleDeps: [
-    'cvox.BrailleUtil',
     'cvox.ExpandingBrailleTranslator',
     'cvox.LibLouis',
     'cvox.Spannable',
+    'cvox.ValueSelectionSpan',
+    'cvox.ValueSpan',
   ]
 };
 
 /**
  * An implementation of {@link cvox.LibLouis.Translator} whose translation
  * output is an array buffer of the same byte length as the input and where
  * each byte is equal to the character code of {@code resultChar}.  The
  * position mappings are one to one in both directions.
  * @param {string} resultChar A one character string used for each byte of the
  *     result.
@@ skipping 31 matching lines @@
   assertTrue(actual instanceof ArrayBuffer);
   var a = new Uint8Array(actual);
   assertEquals(expected.length, a.length);
   for (var i = 0; i < a.length; ++i) {
     assertEquals(expected.charCodeAt(i), a[i], 'Position ' + i);
   }
 }
 
 TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'TranslationError',
     function() {
-  var text = new cvox.Spannable('error ok', new cvox.BrailleUtil.ValueSpan());
-  text.setSpan(new cvox.BrailleUtil.ValueSelectionSpan, 0, 0);
+  var text = new cvox.Spannable('error ok', new cvox.ValueSpan());
+  text.setSpan(new cvox.ValueSelectionSpan, 0, 0);
   var contractedTranslator = new FakeTranslator('c');
   // Translator that always results in an error.
   var uncontractedTranslator = {
     translate: function(text, callback) {
       callback(null, null, null);
     }
   };
   var translationResult = null;
 
   var expandingTranslator = new cvox.ExpandingBrailleTranslator(
@@ skipping 104 matching lines @@
 /**
  * Creates a spannable text with optional selection.
  * @param {string} text The text.
  * @param {=opt_selectionStart} Selection start or caret position.  No
  *     selection is added if undefined.
  * @param {=opt_selectionEnd} Selection end if selection is not a caret.
  */
 function createText(text, opt_selectionStart, opt_selectionEnd) {
   var result = new cvox.Spannable(text);
 
-  result.setSpan(
-      new cvox.BrailleUtil.ValueSpan, 0, text.length);
+  result.setSpan(new cvox.ValueSpan, 0, text.length);
   if (goog.isDef(opt_selectionStart)) {
     result.setSpan(
-        new cvox.BrailleUtil.ValueSelectionSpan,
+        new cvox.ValueSelectionSpan,
         opt_selectionStart,
         goog.isDef(opt_selectionEnd) ? opt_selectionEnd : opt_selectionStart);
   }
   return result;
 }
 
 
 var TEXT = 'Hello, world!';
 
 TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'successfulTranslations',
@@ skipping 38 matching lines @@
   for (var i = 0, testCase; testCase = TESTDATA[i]; ++i) {
     runTranslationTestVariants(testCase, false, expType.SELECTION);
     runTranslationTestVariants(testCase, true, expType.NONE);
     runTranslationTestVariants(testCase, true, expType.SELECTION);
     runTranslationTestVariants(testCase, true, expType.ALL);
   }
   // Make sure that the logic above runs the tests, adjust when adding more
   // tests.
   assertEquals(64, totalRunTranslationTests);
 });