Ensure WebView notifies desktop automation on creation, destruction, and change

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..31c573f5ddbb0c3f802c81dbd65683d6e4ee0d0f 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
@@ -97,7 +97,7 @@ TEST_F('BackgroundTest', 'InitialFeedback', function() {
   }, true);
   cvox.ChromeVox.tts.expectSpeech('end', testDone, true);
 
-  this.runWithDocument(function() {/*!
+  this.runWithAutomation(function() {/*!
     <p>start
     <p>end
   */},
@@ -106,8 +106,7 @@ TEST_F('BackgroundTest', 'InitialFeedback', 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.runWithAutomation(this.linksAndHeadingsDoc, function() {
       var doCmd = this.doCmd.bind(this);
       var expectAfter =
           cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
@@ -137,8 +136,8 @@ TEST_F('BackgroundTest', 'ForwardBackwardNavigation', function() {
 });
 
 TEST_F('BackgroundTest', 'CaretNavigation', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', null, true);
-  this.runWithDocument(this.linksAndHeadingsDoc, function() {
+  cvox.ChromeVox.tts.expectSpeech('start', function() {
+  this.runWithAutomation(this.linksAndHeadingsDoc, function() {
       var doCmd = this.doCmd.bind(this);
       var expectAfter =
           cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
@@ -168,7 +167,7 @@ TEST_F('BackgroundTest', 'CaretNavigation', function() {
 
 // Flaky: http://crbug.com/451362
 TEST_F('BackgroundTest', 'DISABLED_SelectSingleBasic', function() {
-  this.runWithDocument(this.formsDoc, function(tabId) {
+  this.runWithAutomation(this.formsDoc, function(tabId) {
     var sendDownToSelect =
         this.sendKeyToElement.bind(this, tabId, 'Down', '#fruitSelect');
     var expect = cvox.ChromeVox.tts.expectSpeech.bind(cvox.ChromeVox.tts);
@@ -180,16 +179,12 @@ TEST_F('BackgroundTest', 'DISABLED_SelectSingleBasic', function() {
 });
 
 TEST_F('BackgroundTest', 'ContinuousRead', function() {
-  cvox.ChromeVox.tts.expectSpeech('start', null, true);
-  this.runWithDocument(this.linksAndHeadingsDoc, function() {
+  this.runWithAutomation(this.linksAndHeadingsDoc, function() {
     var doCmd = this.doCmd.bind(this);
     var expect =
         cvox.ChromeVox.tts.expectSpeechAfter.bind(cvox.ChromeVox.tts);
-    var sendEndEvent = function() {
-        window.setTimeout(function() {
-          this.sendEndEvent();
-      }.bind(this), 0);
-    }.bind(cvox.ChromeVox.tts);
+    var sendEndEvent =
+        cvox.ChromeVox.tts.sendEndEvent.bind(cvox.ChromeVox.tts);
 
     expect('start', doCmd('continuousRead'));
     expect('alpha Link', sendEndEvent);