Video Player: Add a test to open a single video file

chrome/test/data/extensions/api_test/file_manager_browsertest/common/test_util_common.js

Index: chrome/test/data/extensions/api_test/file_manager_browsertest/common/test_util_common.js
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/gallery/test_util.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/common/test_util_common.js
similarity index 53%
copy from chrome/test/data/extensions/api_test/file_manager_browsertest/gallery/test_util.js
copy to chrome/test/data/extensions/api_test/file_manager_browsertest/common/test_util_common.js
index 25c7f3b6e8d966decafd996674a7a65256a73398..9c2de89b5043b41633f0438d72d0b95a6b76be99 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/gallery/test_util.js
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/common/test_util_common.js
@@ -12,14 +12,15 @@
  * @return {Promise} Promise to be fulflled with Array.<FileEntry>.
  */
 function getFilesUnderVolume(volumeType, names) {
-  var displayRootPromise = backgroundComponentsPromise.then(
-      function(backgroundComponent) {
-        var volumeManager = backgroundComponent.volumeManager;
-        var volumeInfo = volumeManager.getCurrentProfileVolumeInfo(volumeType);
-        return new Promise(function(fulfill, reject) {
-          volumeInfo.resolveDisplayRoot(fulfill, reject);
-        });
-      });
+  var displayRootPromise = new Promise(function(fulfill, reject) {
+    VolumeManager.getInstance(fulfill);

[hirono, 2014/08/20 04:14:06]

VolumeManager.getInstance returns promise.
resolveDisplayRoot also returns promise now.
So we can do:

VolumeManager.getInstance().then(function(volumeManager) {
  ...
  return volumeInfo.resolveDisplayRoot();
});

[yoshiki, 2014/08/20 04:26:21]

Done.

+  }).then(function(volumeManager) {
+    var volumeInfo = volumeManager.getCurrentProfileVolumeInfo(volumeType);
+    return new Promise(function(fulfill, reject) {
+      volumeInfo.resolveDisplayRoot(fulfill, reject);
+    });
+  });
+
   return displayRootPromise.then(function(displayRoot) {
     var filesPromise = names.map(function(name) {
       return new Promise(
@@ -64,61 +65,6 @@ function waitForElementLost(appWindow, query) {
 }
 
 /**
- * Launches the Gallery app with the test entries.
- *
- * @param {string} testVolumeName Test volume name passed to the addEntries
- *     function. Either 'drive' or 'local'.
- * @param {VolumeManagerCommon.VolumeType} volumeType Volume type.
- * @param {Array.<TestEntryInfo>} entries Entries to be parepared and passed to
- *     the application.
- * @param {Array.<TestEntryInfo>=} opt_selected Entries to be selected. Should
- *     be a sub-set of the entries argument.
- */
-function launchWithTestEntries(
-    testVolumeName, volumeType, entries, opt_selected) {
-  var entriesPromise = addEntries([testVolumeName], entries).then(function() {
-    var selectedEntries = opt_selected || entries;
-    return getFilesUnderVolume(
-        volumeType,
-        selectedEntries.map(function(entry) { return entry.nameText; }));
-  });
-  return launch(entriesPromise).then(function() {
-    var launchedPromise = Promise.all([appWindowPromise, entriesPromise]);
-    return launchedPromise.then(function(results) {
-      return {appWindow: results[0], entries: results[1]};
-    });
-  });
-}
-
-/**
- * Waits until the expected image is shown.
- *
- * @param {document} document Document.
- * @param {number} width Expected width of the image.
- * @param {number} height Expected height of the image.
- * @param {string} name Expected name of the image.
- * @return {Promise} Promsie to be fulfilled when the check is passed.
- */
-function waitForSlideImage(document, width, height, name) {
-  var expected = {width: width, height: height, name: name};
-  return repeatUntil(function() {
-    var fullResCanvas = document.querySelector(
-        '.gallery[mode="slide"] .content canvas.fullres');
-    var nameBox = document.querySelector('.namebox');
-    var actual = {
-      width: fullResCanvas && fullResCanvas.width,
-      height: fullResCanvas && fullResCanvas.height,
-      name: nameBox && nameBox.value
-    };
-    if (!chrome.test.checkDeepEq(expected, actual)) {
-      return pending('Slide mode state, expected is %j, actual is %j.',
-                     expected, actual);
-    }
-    return actual;
-  });
-}
-
-/**
  * Shorthand for clicking an element.
  * @param {AppWindow} appWindow Application window.
  * @param {string} query Query for the element.