Refactorings to reduce dependencies in ChromeVox 2.

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.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 Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
 
 goog.require('AutomationUtil.Dir');
 goog.require('cursors.Cursor');
 goog.require('cursors.Range');
 goog.require('cursors.Unit');
-goog.require('cvox.BrailleUtil.ValueSelectionSpan');
-goog.require('cvox.BrailleUtil.ValueSpan');
 goog.require('cvox.Spannable');
+goog.require('cvox.ValueSelectionSpan');
+goog.require('cvox.ValueSpan');
 
 goog.scope(function() {
 var Dir = AutomationUtil.Dir;
 
 /**
  * An Output object formats a cursors.Range into speech, braille, or both
  * representations. This is typically a cvox.Spannable.
  *
  * The translation from Range to these output representations rely upon format
  * rules which specify how to convert AutomationNode objects into annotated
@@ skipping 302 matching lines @@
     var startIndex = -1, endIndex = -1;
     if (selSpan) {
       var valueStart = this.brailleBuffer_.getSpanStart(selSpan);
       var valueEnd = this.brailleBuffer_.getSpanEnd(selSpan);
       if (valueStart === undefined || valueEnd === undefined) {
         valueStart = -1;
         valueEnd = -1;
       } else {
         startIndex = valueStart + selSpan.startIndex;
         endIndex = valueStart + selSpan.endIndex;
-        this.brailleBuffer_.setSpan(new cvox.BrailleUtil.ValueSpan(valueStart),
+        this.brailleBuffer_.setSpan(new cvox.ValueSpan(valueStart),
                                     valueStart, valueEnd);
-        this.brailleBuffer_.setSpan(new cvox.BrailleUtil.ValueSelectionSpan(),
+        this.brailleBuffer_.setSpan(new cvox.ValueSelectionSpan(),
                                     startIndex, endIndex);
       }
     }
 
     var output = new cvox.NavBraille({
       text: this.brailleBuffer_,
       startIndex: startIndex,
       endIndex: endIndex
     });
 
@@ skipping 352 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope