| 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 7c77249d16f6584458a504a60b404723f79493c4..db8f1e92d617272daf73cd8ae7020005bd559b71 100644
|
| --- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| +++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs
|
| @@ -446,7 +446,7 @@ TEST_F('BackgroundTest', 'ToggleChromeVoxVersion', function() {
|
| true);
|
|
|
| mockFeedback.call(togglerFromBackground)
|
| - .expectSpeech('Switched to Classic ChromeVox')
|
| + .expectSpeech('Switched to Classic ChromeVox')
|
| .call(togglerFromContent)
|
| .expectSpeech('Switched to ChromeVox Next')
|
| .call(togglerFromBackground)
|
| @@ -465,6 +465,7 @@ SYNC_TEST_F('BackgroundTest', 'GlobsToRegExp', function() {
|
| Background.globsToRegExp_(['url1*', 'u?l2', '*url3']).toString());
|
| });
|
|
|
| +// Flaky, see http://crbug.com/635032
|
| TEST_F('BackgroundTest', 'ActiveOrInactive', function() {
|
| var mockFeedback = this.createMockFeedback();
|
| this.runWithLoadedTree(function() {/*!
|
| @@ -685,7 +686,7 @@ TEST_F('BackgroundTest', 'ForwardNavigationThroughIframeButtons', function() {
|
|
|
| desktopNode.addEventListener('loadComplete', function(evt) {
|
| runTestIfIframeIsLoaded(rootNode);
|
| - }, true);
|
| + }, true);
|
| });
|
| });
|
| });
|
| @@ -731,7 +732,7 @@ TEST_F('BackgroundTest', 'ForwardObjectNavigationThroughIframes', function() {
|
|
|
| desktopNode.addEventListener('loadComplete', function(evt) {
|
| runTestIfIframeIsLoaded(rootNode);
|
| - }, true);
|
| + }, true);
|
| });
|
| });
|
| });
|
|
|