Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / test / data / extensions / api_test / file_manager_browsertest / file_manager / copy_between_windows.js

diff --git a/src/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/copy_between_windows.js b/src/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/copy_between_windows.js
index 1c5b2f5..4b72648 100644 (file)
--- a/src/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/copy_between_windows.js
+++ b/src/chrome/test/data/extensions/api_test/file_manager_browsertest/file_manager/copy_between_windows.js
@@ -16,8 +16,8 @@ function openTwoWindows(rootPath1, rootPath2) {
     openNewWindow(null, rootPath2)
   ]).then(function(windowIds) {
     return Promise.all([
-      waitForElement(windowIds[0], '#detail-table'),
-      waitForElement(windowIds[1], '#detail-table'),
+      remoteCall.waitForElement(windowIds[0], '#detail-table'),
+      remoteCall.waitForElement(windowIds[1], '#detail-table'),
     ]).then(function() {
       return windowIds;
     });
@@ -33,25 +33,27 @@ function openTwoWindows(rootPath1, rootPath2) {
  */
 function copyBetweenWindows(windowId1, windowId2, file) {
   // Select the file.
-  return waitForFiles(windowId1, [file.getExpectedRow()]).
+  return remoteCall.waitForFiles(windowId1, [file.getExpectedRow()]).
   then(function() {
-    return callRemoteTestUtil('selectFile', windowId1, [file.nameText]);
+    return remoteCall.callRemoteTestUtil('selectFile',
+                                         windowId1,
+                                         [file.nameText]);
   }).
   then(function(result) {
     chrome.test.assertTrue(result);
-    callRemoteTestUtil('execCommand', windowId1, ['copy']);
+    remoteCall.callRemoteTestUtil('execCommand', windowId1, ['copy']);
   }).
   then(function() {
-    return waitForFiles(windowId2, []);
+    return remoteCall.waitForFiles(windowId2, []);
   }).
   then(function() {
     // Paste it.
-    return callRemoteTestUtil('execCommand', windowId2, ['paste']);
+    return remoteCall.callRemoteTestUtil('execCommand', windowId2, ['paste']);
   }).
   then(function() {
-    return waitForFiles(windowId2,
-                        [file.getExpectedRow()],
-                        {ignoreLastModifiedTime: true});
+    return remoteCall.waitForFiles(windowId2,
+                                   [file.getExpectedRow()],
+                                   {ignoreLastModifiedTime: true});
   });
 };
 
@@ -75,8 +77,9 @@ testcase.copyBetweenWindowsDriveToLocal = function() {
       function(appIds) {
         windowId1 = appIds[0];
         windowId2 = appIds[1];
-        waitForFiles(windowId1,
-                     [ENTRIES.hello.getExpectedRow()]).then(this.next);
+        remoteCall.waitForFiles(
+            windowId1,
+            [ENTRIES.hello.getExpectedRow()]).then(this.next);
       },
       // Copy a file between windows.
       function() {
@@ -107,8 +110,9 @@ testcase.copyBetweenWindowsDriveToUsb = function() {
       function(appIds) {
         windowId1 = appIds[0];
         windowId2 = appIds[1];
-        waitForFiles(windowId1,
-                     [ENTRIES.hello.getExpectedRow()]).then(this.next);
+        remoteCall.waitForFiles(
+            windowId1,
+            [ENTRIES.hello.getExpectedRow()]).then(this.next);
       },
       // Mount a fake USB volume.
       function() {
@@ -117,11 +121,12 @@ testcase.copyBetweenWindowsDriveToUsb = function() {
       },
       // Wait for the mount.
       function(result) {
-        waitForElement(windowId2, REMOVABLE_VOLUME_QUERY).then(this.next);
+        remoteCall.waitForElement(windowId2, REMOVABLE_VOLUME_QUERY).
+            then(this.next);
       },
       // Click the USB volume.
       function() {
-        callRemoteTestUtil(
+        remoteCall.callRemoteTestUtil(
             'fakeMouseClick', windowId2, [REMOVABLE_VOLUME_QUERY], this.next);
       },
       // Copy a file between windows.
@@ -174,7 +179,8 @@ testcase.copyBetweenWindowsLocalToUsb = function() {
     function(appIds) {
       windowId1 = appIds[0];
       windowId2 = appIds[1];
-      waitForFiles(windowId2, [ENTRIES.hello.getExpectedRow()]).then(this.next);
+      remoteCall.waitForFiles(windowId2, [ENTRIES.hello.getExpectedRow()]).
+          then(this.next);
     },
     // Mount a fake USB volume.
     function() {
@@ -183,11 +189,12 @@ testcase.copyBetweenWindowsLocalToUsb = function() {
     },
     // Wait for the mount.
     function(result) {
-      waitForElement(windowId2, REMOVABLE_VOLUME_QUERY).then(this.next);
+      remoteCall.waitForElement(windowId2, REMOVABLE_VOLUME_QUERY).
+          then(this.next);
     },
     // Click the USB volume.
     function() {
-      callRemoteTestUtil(
+      remoteCall.callRemoteTestUtil(
           'fakeMouseClick', windowId2, [REMOVABLE_VOLUME_QUERY], this.next);
     },
     // Copy a file between windows.
@@ -214,17 +221,17 @@ testcase.copyBetweenWindowsUsbToDrive = function() {
     },
     // Add a file to USB.
     function(result) {
-      chrome.test.assertTrue(JSON.parse(result));
       addEntries(['usb'], [ENTRIES.hello], this.next);
     },
     // Wait for the mount.
     function(result) {
       chrome.test.assertTrue(result);
-      waitForElement(windowId1, REMOVABLE_VOLUME_QUERY).then(this.next);
+      remoteCall.waitForElement(windowId1, REMOVABLE_VOLUME_QUERY).
+          then(this.next);
     },
     // Click the volume.
     function() {
-      callRemoteTestUtil(
+      remoteCall.callRemoteTestUtil(
           'fakeMouseClick', windowId1, [REMOVABLE_VOLUME_QUERY], this.next);
     },
     // Copy a file between windows.
@@ -251,17 +258,17 @@ testcase.copyBetweenWindowsUsbToLocal = function() {
     },
     // Add a file to USB.
     function(result) {
-      chrome.test.assertTrue(JSON.parse(result));
       addEntries(['usb'], [ENTRIES.hello], this.next);
     },
     // Wait for the mount.
     function(result) {
       chrome.test.assertTrue(result);
-      waitForElement(windowId1, REMOVABLE_VOLUME_QUERY).then(this.next);
+      remoteCall.waitForElement(windowId1, REMOVABLE_VOLUME_QUERY).
+          then(this.next);
     },
     // Click the volume.
     function() {
-      callRemoteTestUtil(
+      remoteCall.callRemoteTestUtil(
           'fakeMouseClick', windowId1, [REMOVABLE_VOLUME_QUERY], this.next);
     },
     // Copy a file between windows.
@@ -273,4 +280,3 @@ testcase.copyBetweenWindowsUsbToLocal = function() {
     }
   ]);
 };
-