Chromium Code Reviews| Index: chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/open_video_files.js |
| diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/open_video_files.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/open_video_files.js |
| index 817b597a47ba0842019c4ffa91fd0e65e82c8693..5dc75f573ac528156870db9e1b6558400c87f7cf 100644 |
| --- a/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/open_video_files.js |
| +++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/open_video_files.js |
| @@ -13,12 +13,13 @@ |
| */ |
| function openSingleVideo(volumeName, volumeType) { |
| var entries = [ENTRIES.world]; |
| - return launch(volumeName, volumeType, entries).then(function(videoPlayer) { |
| + return launch(volumeName, volumeType, entries).then(function(args) { |
| + var videoPlayer = args[1]; |
| chrome.test.assertTrue(videoPlayer.hasAttribute('first-video')); |
| chrome.test.assertTrue(videoPlayer.hasAttribute('last-video')); |
| chrome.test.assertFalse(videoPlayer.hasAttribute('multiple')); |
| chrome.test.assertFalse(videoPlayer.hasAttribute('disabled')); |
| - return videoPlayer; |
| + return args; |
| }); |
| } |
| @@ -28,7 +29,8 @@ function openSingleVideo(volumeName, volumeType) { |
| */ |
| function openSingleVideoOnDownloads() { |
| var test = openSingleVideo('local', VolumeManagerCommon.VolumeType.DOWNLOADS); |
| - return test.then(function(videoPlayer) { |
| + return test.then(function(args) { |
| + var videoPlayer = args[1]; |
| chrome.test.assertFalse(videoPlayer.hasAttribute('cast-available')); |
| }); |
| } |
| @@ -39,8 +41,15 @@ function openSingleVideoOnDownloads() { |
| */ |
| function openSingleVideoOnDrive() { |
| var test = openSingleVideo('drive', VolumeManagerCommon.VolumeType.DRIVE); |
| - return test.then(function(videoPlayer) { |
| - // TODO(yoshiki): flip this after launching the feature. |
| + return test.then(function(args) { |
| + var appWindow = args[0]; |
| + var videoPlayer = args[1]; |
| chrome.test.assertFalse(videoPlayer.hasAttribute('cast-available')); |
| + |
| + // Loads cast extension and wait for available cast. |
| + loadMockCastExtesntion(appWindow); |
| + return waitForElement(appWindow, '#video-player[cast-available]'); |
| + }).then(function(videoPlayer) { |
| + return true; |
|
hirono
2014/08/26 00:56:58
Return true is needed?
yoshiki
2014/08/26 05:31:24
We don't need it. Removed.
|
| }); |
| } |