Files.app: Test local delete and directory delete

BUG=241113
TEST=browser_tests --gtest_filter="*FileManager*"

Review URL: https://chromiumcodereview.appspot.com/15919006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202843 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc

@@ -484,6 +484,12 @@ IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestGalleryOpen) {
   ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
+IN_PROC_BROWSER_TEST_P(FileManagerBrowserLocalTest, TestKeyboardDelete) {
+  ResultCatcher catcher;
+  ASSERT_NO_FATAL_FAILURE(StartTest("keyboardDeleteDownloads"));
+  ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
 // Disabled temporarily since fails on Linux Chromium OS ASAN Tests (2).
 // TODO(mtomasz): crbug.com/243611.
 IN_PROC_BROWSER_TEST_P(FileManagerBrowserDriveTest, DISABLED_TestGalleryOpen) {

chrome/test/data/extensions/api_test/file_manager_browsertest/test_cases.js

@@ -433,8 +433,9 @@ testcase.intermediate.keyboardCopy = function(path, callback) {
     // Verify the result.
     function(fileList) {
       chrome.test.assertTrue(isCopyPresent(filename, fileList));
-      checkIfNoErrorsOccured(chrome.test.succeed);
-    }
+      checkIfNoErrorsOccured(steps.shift());
+    },
+    function() {}
   ];
   steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
   steps.shift()();
@@ -455,6 +456,7 @@ testcase.intermediate.keyboardDelete = function(path) {
   }
 
   var filename = 'world.ogv';
+  var directoryName = 'photos';
   var appId, fileListBefore;
   var steps = [
     // Set up File Manager.
@@ -478,11 +480,29 @@ testcase.intermediate.keyboardDelete = function(path) {
       callRemoteTestUtil('waitForFileListChange', appId,
                          [fileListBefore.length], steps.shift());
     },
-    // Verify the result.
+    // Delete the directory.
     function(fileList) {
+      fileListBefore = fileList;
       chrome.test.assertFalse(isFilePresent(filename, fileList));
-      checkIfNoErrorsOccured(chrome.test.succeed);
-    }
+      chrome.test.assertTrue(isFilePresent(directoryName, fileList));
+      callRemoteTestUtil('deleteFile', appId, [directoryName], steps.shift());
+    },
+    // Reply to a dialog.
+    function(result) {
+      chrome.test.assertTrue(result);
+      callRemoteTestUtil('waitAndAcceptDialog', appId, [], steps.shift());
+    },
+    // Wait for a file list change.
+    function() {
+      callRemoteTestUtil('waitForFileListChange', appId,
+                         [fileListBefore.length], steps.shift());
+    },
+    // Verify the result.
+    function(fileList) {
+      chrome.test.assertFalse(isFilePresent(directoryName, fileList));
+      checkIfNoErrorsOccured(steps.shift());
+    },
+    function() {}
   ];
   steps = steps.map(function(f) { return chrome.test.callbackPass(f); });
   steps.shift()();