Fix EditingTest.RichText*

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

 // Copyright 2015 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',
              '../../testing/assert_additions.js']);
 
 GEN_INCLUDE(['../../testing/mock_feedback.js']);
 
@@ skipping 194 matching lines @@
     */},
     [
       {start: 0, end: 4, text: 'this'},
       {start: 5, end: 5, text: ''},
       {start: 6, end: 6, text: ''},
       {start: 7, end: 8, text: 'I'},
       {start: 9, end: 17, text: 'can test'},
     ]);
 });
 
-// Fails flakily, see https://crbug.com/724847.
-TEST_F('EditingTest', 'DISABLED_RichTextMoveByLine', function() {
+TEST_F('EditingTest', 'RichTextMoveByLine', function() {
   editing.useRichText = true;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>
       <h2>hello</h2>
       <div><br></div>
       <p>This is a <a href="#test">test</a> of rich text</p>
     </div>
     <script>
       var dir = 'forward';
       var line = 0;
       document.getElementById('go').addEventListener('click', function() {
         var sel = getSelection();
         sel.modify('move', dir, 'line');
         if (dir == 'forward')
           line++;
         else
           line--;
 
         if (line == 0)
           dir = 'forward';
         if (line == 2)
           dir = 'backward';
       }, true);
     </script>
   */}, function(root) {
     var input = root.find({role: RoleType.TEXT_FIELD});
     var moveByLine = input.doDefault.bind(input);
-    mockFeedback.call(input.focus.bind(input))
-        .expectSpeech('Text area')
-        .call(moveByLine)
-        .expectSpeech('\n')
-        .expectBraille('\n')
-        .call(moveByLine)
-        .expectSpeech('This is a ', 'test', 'Link', ' of rich text')
-        .expectBraille('This is a test lnk of rich text')
-        .call(moveByLine)
-        .expectSpeech('\n')
-        .expectBraille('\n')
-        .call(moveByLine)
-        .expectSpeech('hello', 'Heading 2')
-        .expectBraille('hello h2')
-        .replay();
+    this.listenOnce(input, 'focus', function() {
+      mockFeedback.call(moveByLine)
+          .expectSpeech('\n')
+          .expectBraille('\n')
+          .call(moveByLine)
+          .expectSpeech('This is a ', 'test', 'Link', ' of rich text')
+          .expectBraille('This is a test lnk of rich text')
+          .call(moveByLine)
+          .expectSpeech('\n')
+          .expectBraille('\n')
+          .call(moveByLine)
+          .expectSpeech('hello', 'Heading 2')
+          .expectBraille('hello h2')
+          .replay();
+    });
+    input.focus();
   });
 });
 
-// Fails flakily, see https://crbug.com/732000.
-TEST_F('EditingTest', 'DISABLED_RichTextMoveByCharacter', function() {
+TEST_F('EditingTest', 'RichTextMoveByCharacter', function() {
   editing.useRichText = true;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>This <b>is</b> a test.</div>
 
     <script>
       var dir = 'forward';
       var char = 0;
       document.getElementById('go').addEventListener('click', function() {
         var sel = getSelection();
         sel.modify('move', dir, 'character');
         if (dir == 'forward')
           char++;
         else
           char--;
 
         if (char == 0)
           dir = 'forward';
         if (line == 16)
           dir = 'backward';
       }, true);
     </script>
   */}, function(root) {
     var input = root.find({role: RoleType.TEXT_FIELD});
-    var moveByChar = input.doDefault.bind(input)
+    var moveByChar = input.doDefault.bind(input);
     var lineText = 'This is a test.';
 
-    mockFeedback.call(input.focus.bind(input))
-        .expectSpeech(lineText)
-        .expectSpeech('Text area')
-        .call(moveByChar)
-        .expectSpeech('h')
-        .expectBraille(lineText, { startIndex: 1, endIndex: 1 })
-        .call(moveByChar)
-        .expectSpeech('i')
-        .expectBraille(lineText, { startIndex: 2, endIndex: 2 })
-        .call(moveByChar)
-        .expectSpeech('s')
-        .expectBraille(lineText, { startIndex: 3, endIndex: 3 })
-        .call(moveByChar)
-        .expectSpeech(' ')
-        .expectBraille(lineText, { startIndex: 4, endIndex: 4 })
+    this.listenOnce(input, 'focus', function() {
+      mockFeedback.call(moveByChar)
+          .expectSpeech('h')
+          .expectBraille(lineText, { startIndex: 1, endIndex: 1 })
+          .call(moveByChar)
+          .expectSpeech('i')
+          .expectBraille(lineText, { startIndex: 2, endIndex: 2 })
+          .call(moveByChar)
+          .expectSpeech('s')
+          .expectBraille(lineText, { startIndex: 3, endIndex: 3 })
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, { startIndex: 4, endIndex: 4 })
 
-        .call(moveByChar)
-        .expectSpeech('i')
-        .expectSpeech('Bold start')
-        .expectBraille(lineText, { startIndex: 5, endIndex: 5 })
+          .call(moveByChar)
+          .expectSpeech('i')
+          .expectSpeech('Bold start')
+          .expectBraille(lineText, { startIndex: 5, endIndex: 5 })
 
-        .call(moveByChar)
-        .expectSpeech('s')
-        .expectSpeech('Bold end')
-        .expectBraille(lineText, { startIndex: 6, endIndex: 6 })
+          .call(moveByChar)
+          .expectSpeech('s')
+          .expectSpeech('Bold end')
+          .expectBraille(lineText, { startIndex: 6, endIndex: 6 })
 
-        .call(moveByChar)
-        .expectSpeech(' ')
-        .expectBraille(lineText, { startIndex: 7, endIndex: 7 })
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, { startIndex: 7, endIndex: 7 })
 
-        .call(moveByChar)
-        .expectSpeech('a')
-        .expectBraille(lineText, { startIndex: 8, endIndex: 8 })
+          .call(moveByChar)
+          .expectSpeech('a')
+          .expectBraille(lineText, { startIndex: 8, endIndex: 8 })
 
-        .call(moveByChar)
-        .expectSpeech(' ')
-        .expectBraille(lineText, { startIndex: 9, endIndex: 9 })
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, { startIndex: 9, endIndex: 9 })
 
-        .replay();
+          .replay();
+    });
+    input.focus();
   });
 });
 
 // Tests specifically for cursor workarounds.
-// Fails flakily, see https://crbug.com/731825.
-TEST_F('EditingTest', 'DISABLED_RichTextMoveByCharacterNodeWorkaround', function() {
+TEST_F('EditingTest', 'RichTextMoveByCharacterNodeWorkaround', function() {
   editing.useRichText = true;
   var mockFeedback = this.createMockFeedback();
   this.runWithLoadedTree(function() {/*!
     <div id="go" role="textbox" contenteditable>hello <b>world</b></div>
 
     <script>
       document.getElementById('go').addEventListener('click', function() {
         var sel = getSelection();
         sel.modify('move', 'forward', 'character');
       }, true);
     </script>
   */}, function(root) {
     var input = root.find({role: RoleType.TEXT_FIELD});
     var moveByChar = input.doDefault.bind(input)
     var lineText = 'hello world';
 
-    mockFeedback.call(input.focus.bind(input))
-        .expectSpeech(lineText)
-        .expectSpeech('Text area')
-        .call(moveByChar)
-        .expectSpeech('e')
-        .expectBraille(lineText, { startIndex: 1, endIndex: 1 })
-        .call(moveByChar)
-        .expectSpeech('l')
-        .expectBraille(lineText, { startIndex: 2, endIndex: 2 })
-        .call(moveByChar)
-        .expectSpeech('l')
-        .expectBraille(lineText, { startIndex: 3, endIndex: 3 })
-        .call(moveByChar)
-        .expectSpeech('o')
-        .expectBraille(lineText, { startIndex: 4, endIndex: 4 })
-        .call(moveByChar)
-        .expectSpeech(' ')
-        .expectBraille(lineText, { startIndex: 5, endIndex: 5 })
-        .call(moveByChar)
-        .expectSpeech('w')
-        .expectBraille(lineText, { startIndex: 6, endIndex: 6 })
-        .replay();
+    this.listenOnce(input, 'focus', function() {
+      mockFeedback.call(moveByChar)
+          .expectSpeech('e')
+          .expectBraille(lineText, { startIndex: 1, endIndex: 1 })
+          .call(moveByChar)
+          .expectSpeech('l')
+          .expectBraille(lineText, { startIndex: 2, endIndex: 2 })
+          .call(moveByChar)
+          .expectSpeech('l')
+          .expectBraille(lineText, { startIndex: 3, endIndex: 3 })
+          .call(moveByChar)
+          .expectSpeech('o')
+          .expectBraille(lineText, { startIndex: 4, endIndex: 4 })
+          .call(moveByChar)
+          .expectSpeech(' ')
+          .expectBraille(lineText, { startIndex: 5, endIndex: 5 })
+          .call(moveByChar)
+          .expectSpeech('w')
+          .expectBraille(lineText, { startIndex: 6, endIndex: 6 })
+          .replay();
+    });
+    input.focus();
   });
 });