Reland #2: Ensure WebView notifies desktop automation on creation, destruction, and change Original

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

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
index 7ed70f7cf4bc690fd7ee01e4e34a258d858f5d19..08333701e8ac700ed0a0c316c51e7bf7076b0548 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
@@ -92,22 +92,17 @@ TEST_F('BackgroundTest', 'DesktopFocus', function() {
 
 /** Tests feedback once a page loads. */
 TEST_F('BackgroundTest', 'InitialFeedback', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', function() {
-    global.backgroundObj.onGotCommand('nextLine');
-  }, true);
-  cvox.ChromeVox.tts.expectSpeech('end', testDone, true);
+  cvox.ChromeVox.tts.expectSpeech('start', testDone);
 
-  this.runWithDocument(function() {/*!
+  this.runWithTab(function() {/*!
     <p>start
     <p>end
-  */},
-  function() {});
+  */});
 });
 
 /** Tests consistency of navigating forward and backward. */
 TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', null, true);
-  this.runWithDocument(this.linksAndHeadingsDoc, function() {
+  this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
       var doCmd = this.doCmd.bind(this);
       var expectAfter =
           cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
@@ -137,8 +132,7 @@ TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
 });
 
 TEST_F('BackgroundTest', 'CaretNavigation', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', null, true);
-  this.runWithDocument(this.linksAndHeadingsDoc, function() {
+  this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
       var doCmd = this.doCmd.bind(this);
       var expectAfter =
           cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
@@ -168,7 +162,7 @@ TEST_F('BackgroundTest', 'CaretNavigation', function() {
 
 // Flaky: http://crbug.com/451362
 TEST_F('BackgroundTest', 'DISABLED_SelectSingleBasic', function() {
-  this.runWithDocument(this.formsDoc, function(tabId) {
+  this.runWithLoadedTree(this.formsDoc, function(tabId) {
     var sendDownToSelect =
         this.sendKeyToElement.bind(this, tabId, 'Down', '#fruitSelect');
     var expect = cvox.ChromeVox.tts.expectSpeech.bind(cvox.ChromeVox.tts);
@@ -180,8 +174,7 @@ TEST_F('BackgroundTest', 'DISABLED_SelectSingleBasic', function() {
 });
 
 TEST_F('BackgroundTest', 'ContinuousRead', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', null, true);
-  this.runWithDocument(this.linksAndHeadingsDoc, function() {
+  this.runWithLoadedTree(this.linksAndHeadingsDoc, function() {
     var doCmd = this.doCmd.bind(this);
     var expect =
         cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);