Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / test / data / extensions / api_test / file_system_provider / mime_type / test.js

diff --git a/src/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js b/src/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
index 336e89e..2338b6c 100644 (file)
--- a/src/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
+++ b/src/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
@@ -59,75 +59,71 @@ function runTests() {
     // Test if the file with a mime type handled by this testing extension
     // appears on a task list.
     function withMimeIsTask() {
-      var onSuccess = chrome.test.callbackPass();
       test_util.fileSystem.root.getFile(
           TESTING_WITH_MIME_FILE.name,
           {},
-          function(entry) {
-          chrome.fileManagerPrivate.getFileTasks(
-              [entry.toURL()],
-              function(tasks) {
-                chrome.test.assertEq(1, tasks.length);
-                chrome.test.assertEq(
-                    'pkplfbidichfdicaijlchgnapepdginl|app|magic_handler',
-                    tasks[0].taskId);
-                onSuccess();
-              });
-          }, function(error) {
-            chrome.test.fail(error.name);
-          });
+          chrome.test.callbackPass(function(entry) {
+            chrome.fileManagerPrivate.getFileTasks(
+                [entry.toURL()],
+                chrome.test.callbackPass(function(tasks) {
+                  chrome.test.assertEq(1, tasks.length);
+                  chrome.test.assertEq(
+                      'pkplfbidichfdicaijlchgnapepdginl|app|magic_handler',
+                      tasks[0].taskId);
+                }));
+            }), function(error) {
+              chrome.test.fail(error.name);
+            });
     },
 
     // Confirm, that executing that task, will actually run an OnLaunched event.
     // This is another code path, than collecting tasks (tested above).
     function withMimeExecute() {
-      var onSuccess = chrome.test.callbackPass();
       test_util.fileSystem.root.getFile(
-          TESTING_WITH_MIME_FILE.name, {}, function(entry) {
-          chrome.fileManagerPrivate.getFileTasks(
-              [entry.toURL()],
-              function(tasks) {
-                chrome.test.assertEq(1, tasks.length);
-                chrome.test.assertEq(
-                    'pkplfbidichfdicaijlchgnapepdginl|app|magic_handler',
-                    tasks[0].taskId);
-                var onLaunched = function(event) {
-                  chrome.test.assertTrue(!!event);
-                  chrome.test.assertEq('magic_handler', event.id);
-                  chrome.test.assertTrue(!!event.items);
-                  chrome.test.assertEq(1, event.items.length);
-                  chrome.test.assertEq(
-                      TESTING_MIME_TYPE, event.items[0].type);
+          TESTING_WITH_MIME_FILE.name,
+          {},
+          chrome.test.callbackPass(function(entry) {
+            chrome.fileManagerPrivate.getFileTasks(
+                [entry.toURL()],
+                chrome.test.callbackPass(function(tasks) {
+                  chrome.test.assertEq(1, tasks.length);
                   chrome.test.assertEq(
-                      TESTING_WITH_MIME_FILE.name,
-                      event.items[0].entry.name);
-                  chrome.app.runtime.onLaunched.removeListener(onLaunched);
-                  onSuccess();
-                };
-                chrome.app.runtime.onLaunched.addListener(onLaunched);
-                chrome.fileManagerPrivate.executeTask(
-                    tasks[0].taskId, [entry.toURL()]);
-              });
-          }, function(error) {
-            chrome.test.fail(error.name);
-          });
+                      'pkplfbidichfdicaijlchgnapepdginl|app|magic_handler',
+                      tasks[0].taskId);
+                  var onLaunched = function(event) {
+                    chrome.test.assertTrue(!!event);
+                    chrome.test.assertEq('magic_handler', event.id);
+                    chrome.test.assertTrue(!!event.items);
+                    chrome.test.assertEq(1, event.items.length);
+                    chrome.test.assertEq(
+                        TESTING_MIME_TYPE, event.items[0].type);
+                    chrome.test.assertEq(
+                        TESTING_WITH_MIME_FILE.name,
+                        event.items[0].entry.name);
+                    chrome.app.runtime.onLaunched.removeListener(onLaunched);
+                  };
+                  chrome.app.runtime.onLaunched.addListener(onLaunched);
+                  chrome.fileManagerPrivate.executeTask(
+                      tasks[0].taskId, [entry.toURL()]);
+                }));
+            }), function(error) {
+              chrome.test.fail(error.name);
+            });
     },
 
     // The file without a mime set must not appear on the task list for this
     // testing extension.
     function withoutMime() {
-      var onSuccess = chrome.test.callbackPass();
       test_util.fileSystem.root.getFile(
           TESTING_WITHOUT_MIME_FILE.name,
           {},
-          function(entry) {
+          chrome.test.callbackPass(function(entry) {
             chrome.fileManagerPrivate.getFileTasks(
                 [entry.toURL()],
-                function(tasks) {
+                chrome.test.callbackPass(function(tasks) {
                   chrome.test.assertEq(0, tasks.length);
-                  onSuccess();
-                });
-          }, function(error) {
+                }));
+          }), function(error) {
             chrome.test.fail(error.name);
           });
     }