drive: Respect is_recursive parameter in RemoveOperation.

chrome/browser/chromeos/drive/file_system_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/file_system.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 154 matching lines @@
     FileError error = FILE_ERROR_FAILED;
     file_system_->CreateDirectory(
         directory_path,
         false,  // is_exclusive
         false,  // is_recursive
         google_apis::test_util::CreateCopyResultCallback(&error));
     google_apis::test_util::RunBlockingPoolTask();
     return error;
   }
 
-  bool RemoveEntry(const base::FilePath& file_path) {
-    FileError error = FILE_ERROR_FAILED;
-    file_system_->Remove(
-        file_path, false,
-        google_apis::test_util::CreateCopyResultCallback(&error));
-    google_apis::test_util::RunBlockingPoolTask();
-    return error == FILE_ERROR_OK;
-  }
-
   // Gets resource entry by path synchronously.
   scoped_ptr<ResourceEntry> GetResourceEntryByPathSync(
       const base::FilePath& file_path) {
     FileError error = FILE_ERROR_FAILED;
     scoped_ptr<ResourceEntry> entry;
     file_system_->GetResourceEntryByPath(
         file_path,
         google_apis::test_util::CreateCopyResultCallback(&error, &entry));
     google_apis::test_util::RunBlockingPoolTask();
 
@@ skipping 935 matching lines @@
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY, error);
 
   EXPECT_TRUE(EntryExists(src_file_path));
   EXPECT_TRUE(EntryExists(src_file_path));
   EXPECT_TRUE(EntryExists(dest_parent_path));
 
   EXPECT_FALSE(EntryExists(dest_file_path));
 }
 
-TEST_F(FileSystemTest, RemoveEntries) {
-  ASSERT_TRUE(LoadRootFeedDocument());
-
-  base::FilePath nonexisting_file(
-      FILE_PATH_LITERAL("drive/root/Dummy file.txt"));
-  base::FilePath file_in_root(FILE_PATH_LITERAL("drive/root/File 1.txt"));
-  base::FilePath dir_in_root(FILE_PATH_LITERAL("drive/root/Directory 1"));
-  base::FilePath file_in_subdir(
-      FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
-
-  ASSERT_TRUE(EntryExists(file_in_root));
-  scoped_ptr<ResourceEntry> file_in_root_proto = GetResourceEntryByPathSync(
-      file_in_root);
-  ASSERT_TRUE(file_in_root_proto);
-
-  ASSERT_TRUE(EntryExists(dir_in_root));
-  scoped_ptr<ResourceEntry> dir_in_root_proto = GetResourceEntryByPathSync(
-      dir_in_root);
-  ASSERT_TRUE(dir_in_root_proto);
-  ASSERT_TRUE(dir_in_root_proto->file_info().is_directory());
-
-  ASSERT_TRUE(EntryExists(file_in_subdir));
-  scoped_ptr<ResourceEntry> file_in_subdir_proto = GetResourceEntryByPathSync(
-      file_in_subdir);
-  ASSERT_TRUE(file_in_subdir_proto);
-
-  // Once for file in root and once for file...
-  EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
-      Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(2);
-
-  // Remove first file in root.
-  EXPECT_TRUE(RemoveEntry(file_in_root));
-  EXPECT_FALSE(EntryExists(file_in_root));
-  EXPECT_TRUE(EntryExists(dir_in_root));
-  EXPECT_TRUE(EntryExists(file_in_subdir));
-
-  // Remove directory.
-  EXPECT_TRUE(RemoveEntry(dir_in_root));
-  EXPECT_FALSE(EntryExists(file_in_root));
-  EXPECT_FALSE(EntryExists(dir_in_root));
-  EXPECT_FALSE(EntryExists(file_in_subdir));
-
-  // Try removing file in already removed subdirectory.
-  EXPECT_FALSE(RemoveEntry(file_in_subdir));
-
-  // Try removing non-existing file.
-  EXPECT_FALSE(RemoveEntry(nonexisting_file));
-
-  // Try removing root file element.
-  EXPECT_FALSE(RemoveEntry(base::FilePath(FILE_PATH_LITERAL("drive/root"))));
-
-  // Need this to ensure OnDirectoryChanged() is run.
-  google_apis::test_util::RunBlockingPoolTask();
-}
-
 TEST_F(FileSystemTest, CreateDirectory) {
   ASSERT_TRUE(LoadRootFeedDocument());
 
   EXPECT_CALL(*mock_directory_observer_, OnDirectoryChanged(
       Eq(base::FilePath(FILE_PATH_LITERAL("drive/root"))))).Times(1);
 
   // Create directory in root.
   base::FilePath dir_path(FILE_PATH_LITERAL("drive/root/New Folder 1"));
   EXPECT_FALSE(EntryExists(dir_path));
   EXPECT_EQ(FILE_ERROR_OK, AddDirectory(dir_path));
@@ skipping 568 matching lines @@
       entry->resource_id(),
       entry->file_specific_info().file_md5(),
       google_apis::test_util::CreateCopyResultCallback(&success, &cache_entry));
   google_apis::test_util::RunBlockingPoolTask();
 
   EXPECT_TRUE(success);
   EXPECT_FALSE(cache_entry.is_mounted());
 }
 
 }   // namespace drive