| Index: chrome/test/data/extensions/hangout_services_test.js
|
| diff --git a/chrome/test/data/extensions/hangout_services_test.js b/chrome/test/data/extensions/hangout_services_test.js
|
| index 035946ab4ee634764499ee397b9432bee8a0c298..2b0e6abcb0252a30414e00e6b5e64e2278ebdfec 100644
|
| --- a/chrome/test/data/extensions/hangout_services_test.js
|
| +++ b/chrome/test/data/extensions/hangout_services_test.js
|
| @@ -119,24 +119,6 @@ function isExtensionEnabled(callback) {
|
| }
|
|
|
| //
|
| -// Manual tests.
|
| -//
|
| -
|
| -function manualTestChooseDesktopMedia() {
|
| - chooseDesktopMedia(function(results) {
|
| - alert('Cancel ID: ' + results.cancelId +
|
| - ', stream ID: ' + results.streamId);
|
| - });
|
| -}
|
| -
|
| -function manualTestListenForSinksChangedEvent() {
|
| - listenForSinksChangedEvent(function(msg) {
|
| - if (msg['eventName'] && msg['eventName'] == 'onSinksChanged')
|
| - alert('Got onSinksChanged event.');
|
| - });
|
| -}
|
| -
|
| -//
|
| // Automated tests.
|
| //
|
|
|
| @@ -160,6 +142,8 @@ var TESTS = [
|
| //testTimeout,
|
| ];
|
|
|
| +var TEST_TIMEOUT_MS = 3000;
|
| +
|
| function runAllTests(callback) {
|
| var results = '';
|
|
|
| @@ -190,7 +174,7 @@ function runAllTests(callback) {
|
| function onTimeout() {
|
| nextTest(test.name, '', true);
|
| }
|
| - setTimeout(onTimeout, 3000);
|
| + setTimeout(onTimeout, TEST_TIMEOUT_MS);
|
| }
|
|
|
| function nextTest(testName, currentResults, timedOut) {
|
| @@ -291,10 +275,9 @@ function testEnabledLoggingButDiscard(callback) {
|
|
|
| function testGetSinks(callback) {
|
| getSinks(function(sinks) {
|
| - if (sinks.length == 0)
|
| - callback('Got no sinks.');
|
| - else
|
| - callback('');
|
| + // Some bots may have no audio sinks installed, in which case we
|
| + // will get an empty list here.
|
| + callback('');
|
| });
|
| }
|
|
|
|
|