Unittest renamed to chrome_file_system_operation_unittest.cc. Deleting original one.

Svn rename didn't quite work. Also changed the comments in operations file to have clearer
message.

BUG=None
TEST=none

Review URL: http://codereview.chromium.org/3415012

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

2 files changed, 3 insertions, 565 deletions

diff --git a/chrome/browser/file_system/chrome_file_system_operation.h b/chrome/browser/file_system/chrome_file_system_operation.h
index 33d61ca..3b1d3ca 100644
--- a/chrome/browser/file_system/chrome_file_system_operation.h
+++ b/chrome/browser/file_system/chrome_file_system_operation.h
@@ -8,9 +8,9 @@
 #include "webkit/fileapi/file_system_operation.h"
 
 // This class is designed to serve one-time file system operation per instance.
-// Each operation method (CreateFile, CreateDirectory, Copy, Move,
-// DirectoryExists, GetMetadata, ReadDirectory and Remove) must be called
-// only once in its lifetime.
+// Only one method(CreateFile, CreateDirectory, Copy, Move, DirectoryExists,
+// GetMetadata, ReadDirectory and Remove) may be called during the lifetime of
+// this object and it should be called no more than once.
 class ChromeFileSystemOperation : public fileapi::FileSystemOperation {
  public:
   ChromeFileSystemOperation(
diff --git a/chrome/browser/file_system/file_system_operation_unittest.cc b/chrome/browser/file_system/file_system_operation_unittest.cc
deleted file mode 100644
index 0b9e7c8..0000000
--- a/chrome/browser/file_system/file_system_operation_unittest.cc
+++ /dev/null
@@ -1,562 +0,0 @@
-// Copyright (c) 2010 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/file_system/file_system_operation.h"
-
-#include "base/logging.h"
-#include "base/rand_util.h"
-#include "base/scoped_ptr.h"
-#include "base/scoped_temp_dir.h"
-#include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/file_system/file_system_operation_client.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebFileError.h"
-
-namespace {
-int kInvalidRequestId = -1;
-int kFileOperationStatusNotSet = 0;
-int kFileOperationSucceeded = 1;
-}
-
-bool FileExists(FilePath path) {
-  return file_util::PathExists(path) && !file_util::DirectoryExists(path);
-}
-
-class MockClient: public FileSystemOperationClient {
- public:
-  MockClient()
-      : status_(kFileOperationStatusNotSet),
-        request_id_(kInvalidRequestId) {
-  }
-
-  ~MockClient() {}
-
-  virtual void DidFail(WebKit::WebFileError status, int request_id) {
-    status_ = status;
-    request_id_ = request_id;
-  }
-
-  virtual void DidSucceed(int request_id) {
-    status_ = kFileOperationSucceeded;
-    request_id_ = request_id;
-  }
-
-  virtual void DidReadMetadata(
-      const base::PlatformFileInfo& info,
-      int request_id) {
-    info_ = info;
-    request_id_ = request_id;
-  }
-
-  virtual void DidReadDirectory(
-      const std::vector<base::file_util_proxy::Entry>& entries,
-      bool has_more,
-      int request_id) {
-    entries_ = entries;
-    request_id_ = request_id;
-  }
-
-  // Helpers for testing.
-  int status() const { return status_; }
-  int request_id() const { return request_id_; }
-  const base::PlatformFileInfo& info() const { return info_; }
-  const std::vector<base::file_util_proxy::Entry>& entries() const {
-    return entries_;
-  }
-
- private:
-  int status_;
-  int request_id_;
-  base::PlatformFileInfo info_;
-  std::vector<base::file_util_proxy::Entry> entries_;
-};
-
-class FileSystemOperationTest : public testing::Test {
- public:
-     FileSystemOperationTest()
-         : ui_thread_(ChromeThread::UI, &loop_),
-           file_thread_(ChromeThread::FILE, &loop_) {
-       base_.CreateUniqueTempDir();
-     }
-
- protected:
-  virtual void SetUp() {
-    mock_client_.reset(new MockClient());
-    current_request_id_ = kInvalidRequestId;
-    ASSERT_TRUE(base_.IsValid());
-  }
-
-  // Returns a new operation pointer that is created each time it's called.
-  // The pointer is owned by the test class.
-  FileSystemOperation* operation() {
-    current_request_id_ = base::RandInt(0, kint32max);
-    operation_.reset(new FileSystemOperation(
-      current_request_id_, mock_client_.get()));
-    return operation_.get();
-  }
-
-  scoped_ptr<MockClient> mock_client_;
-  int current_request_id_;
-
-  MessageLoop loop_;
-  ChromeThread ui_thread_;
-  ChromeThread file_thread_;
-
-  // Common temp base for all non-existing file/dir path test cases.
-  // This is in case a dir on test machine exists. It's better to
-  // create temp and then create non-existing file paths under it.
-  ScopedTempDir base_;
-
- private:
-  scoped_ptr<FileSystemOperation> operation_;
-
-  DISALLOW_COPY_AND_ASSIGN(FileSystemOperationTest);
-};
-
-TEST_F(FileSystemOperationTest, TestMoveFailureSrcDoesntExist) {
-  FilePath src(base_.path().Append(FILE_PATH_LITERAL("a")));
-  FilePath dest(base_.path().Append(FILE_PATH_LITERAL("b")));
-  operation()->Move(src, dest);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestMoveFailureContainsPath) {
-  FilePath file_under_base = base_.path().Append(FILE_PATH_LITERAL("b"));
-  operation()->Move(base_.path(), file_under_base);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorInvalidModification, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestMoveFailureSrcDirExistsDestFile) {
-  // Src exists and is dir. Dest is a file.
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-  FilePath dest_file;
-  file_util::CreateTemporaryFileInDir(dest_dir.path(), &dest_file);
-
-  operation()->Move(base_.path(), dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(), WebKit::WebFileErrorInvalidModification);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestMoveFailureDestParentDoesntExist) {
-  // Dest. parent path does not exist.
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath nonexisting(base_.path().Append(FILE_PATH_LITERAL("DontExistDir")));
-  FilePath nonexisting_file = nonexisting.Append(
-      FILE_PATH_LITERAL("DontExistFile"));
-
-  operation()->Move(src_dir.path(), nonexisting_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(), WebKit::WebFileErrorNotFound);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestMoveSuccessSrcFileAndOverwrite) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath src_file;
-  file_util::CreateTemporaryFileInDir(src_dir.path(), &src_file);
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-  FilePath dest_file;
-  file_util::CreateTemporaryFileInDir(dest_dir.path(), &dest_file);
-
-  operation()->Move(src_file, dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(dest_file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestMoveSuccessSrcFileAndNew) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath src_file;
-  file_util::CreateTemporaryFileInDir(src_dir.path(), &src_file);
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-  FilePath dest_file(dest_dir.path().Append(FILE_PATH_LITERAL("NewFile")));
-
-  operation()->Move(src_file, dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(dest_file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopyFailureSrcDoesntExist) {
-  FilePath src(base_.path().Append(FILE_PATH_LITERAL("a")));
-  FilePath dest(base_.path().Append(FILE_PATH_LITERAL("b")));
-  operation()->Copy(src, dest);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopyFailureContainsPath) {
-  FilePath file_under_base = base_.path().Append(FILE_PATH_LITERAL("b"));
-  operation()->Copy(base_.path(), file_under_base);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorInvalidModification, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopyFailureSrcDirExistsDestFile) {
-  // Src exists and is dir. Dest is a file.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath dest_file;
-  file_util::CreateTemporaryFileInDir(dir.path(), &dest_file);
-
-  operation()->Copy(base_.path(), dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(), WebKit::WebFileErrorInvalidModification);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopyFailureDestParentDoesntExist) {
-  // Dest. parent path does not exist.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath src_dir = dir.path();
-
-  FilePath nonexisting(base_.path().Append(FILE_PATH_LITERAL("DontExistDir")));
-  file_util::EnsureEndsWithSeparator(&nonexisting);
-  FilePath nonexisting_file = nonexisting.Append(
-      FILE_PATH_LITERAL("DontExistFile"));
-
-  operation()->Copy(src_dir, nonexisting_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(), WebKit::WebFileErrorNotFound);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopySuccessSrcFileAndOverwrite) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath src_file;
-  file_util::CreateTemporaryFileInDir(src_dir.path(), &src_file);
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-  FilePath dest_file;
-  file_util::CreateTemporaryFileInDir(dest_dir.path(), &dest_file);
-
-  operation()->Copy(src_file, dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(dest_file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopySuccessSrcFileAndNew) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath src_file;
-  file_util::CreateTemporaryFileInDir(src_dir.path(), &src_file);
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-  FilePath dest_file(dest_dir.path().Append(FILE_PATH_LITERAL("NewFile")));
-
-  operation()->Copy(src_file, dest_file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(dest_file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopySuccessSrcDir) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-
-  operation()->Copy(src_dir.path(), dest_dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCopyDestParentExistsSuccess) {
-  ScopedTempDir src_dir;
-  ASSERT_TRUE(src_dir.CreateUniqueTempDir());
-  FilePath src_file;
-  file_util::CreateTemporaryFileInDir(src_dir.path(), &src_file);
-
-  ScopedTempDir dest_dir;
-  ASSERT_TRUE(dest_dir.CreateUniqueTempDir());
-
-  operation()->Copy(src_file, dest_dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  FilePath src_filename(src_file.BaseName());
-  EXPECT_TRUE(FileExists(dest_dir.path().Append(src_filename)));
-}
-
-TEST_F(FileSystemOperationTest, TestCreateFileFailure) {
-  // Already existing file and exclusive true.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file;
-
-  file_util::CreateTemporaryFileInDir(dir.path(), &file);
-  operation()->CreateFile(file, true);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(), WebKit::WebFileErrorInvalidModification);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateFileSuccessFileExists) {
-  // Already existing file and exclusive false.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file;
-  file_util::CreateTemporaryFileInDir(dir.path(), &file);
-
-  operation()->CreateFile(file, false);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateFileSuccessExclusive) {
-  // File doesn't exist but exclusive is true.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file = dir.path().Append(FILE_PATH_LITERAL("FileDoesntExist"));
-  operation()->CreateFile(file, true);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(FileExists(file));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateFileSuccessFileDoesntExist) {
-  // Non existing file.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file = dir.path().Append(FILE_PATH_LITERAL("FileDoesntExist"));
-  operation()->CreateFile(file, false);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateDirFailureDestParentDoesntExist) {
-  // Dest. parent path does not exist.
-  FilePath nonexisting(base_.path().Append(
-      FILE_PATH_LITERAL("DirDoesntExist")));
-  file_util::EnsureEndsWithSeparator(&nonexisting);
-  FilePath nonexisting_file = nonexisting.Append(
-      FILE_PATH_LITERAL("FileDoesntExist"));
-  operation()->CreateDirectory(nonexisting_file, false);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateDirFailureDirExists) {
-  // Exclusive and dir existing at path.
-  operation()->CreateDirectory(base_.path(), true);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorInvalidModification, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateDirFailureFileExists) {
-  // Exclusive true and file existing at path.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file;
-  file_util::CreateTemporaryFileInDir(dir.path(), &file);
-  operation()->CreateDirectory(file, true);
-  loop_.RunAllPending();
-  EXPECT_EQ(mock_client_->status(),
-            WebKit::WebFileErrorInvalidModification);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateDirSuccess) {
-  // Dir exists and exclusive is false.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  operation()->CreateDirectory(dir.path(), false);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  // Dir doesn't exist.
-  FilePath nonexisting_dir_path(FILE_PATH_LITERAL("nonexistingdir"));
-  operation()->CreateDirectory(nonexisting_dir_path, false);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(file_util::DirectoryExists(nonexisting_dir_path));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestCreateDirSuccessExclusive) {
-  // Dir doesn't exist.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath nonexisting_dir_path(dir.path().Append(
-      FILE_PATH_LITERAL("nonexistingdir")));
-
-  operation()->CreateDirectory(nonexisting_dir_path, true);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(file_util::DirectoryExists(nonexisting_dir_path));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestExistsAndMetadataFailure) {
-  FilePath nonexisting_dir_path(base_.path().Append(
-      FILE_PATH_LITERAL("nonexistingdir")));
-  operation()->GetMetadata(nonexisting_dir_path);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-
-  operation()->FileExists(nonexisting_dir_path);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  file_util::EnsureEndsWithSeparator(&nonexisting_dir_path);
-  operation()->DirectoryExists(nonexisting_dir_path);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestExistsAndMetadataSuccess) {
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-
-  operation()->DirectoryExists(dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  operation()->GetMetadata(dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_TRUE(mock_client_->info().is_directory);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  FilePath file;
-  file_util::CreateTemporaryFileInDir(dir.path(), &file);
-  operation()->FileExists(file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  operation()->GetMetadata(file);
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_FALSE(mock_client_->info().is_directory);
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestReadDirFailure) {
-  // Path doesn't exists
-    FilePath nonexisting_dir_path(base_.path().Append(
-        FILE_PATH_LITERAL("NonExistingDir")));
-  file_util::EnsureEndsWithSeparator(&nonexisting_dir_path);
-  operation()->ReadDirectory(nonexisting_dir_path);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  // File exists.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath file;
-  file_util::CreateTemporaryFileInDir(dir.path(), &file);
-  operation()->ReadDirectory(file);
-  loop_.RunAllPending();
-  // TODO(kkanetkar) crbug.com/54309 to change the error code.
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestReadDirSuccess) {
-  //      parent_dir
-  //       |       |
-  //  child_dir  child_file
-  // Verify reading parent_dir.
-  ScopedTempDir parent_dir;
-  ASSERT_TRUE(parent_dir.CreateUniqueTempDir());
-  FilePath child_file;
-  file_util::CreateTemporaryFileInDir(parent_dir.path(), &child_file);
-  FilePath child_dir;
-  ASSERT_TRUE(file_util::CreateTemporaryDirInDir(parent_dir.path(),
-      FILE_PATH_LITERAL("child_dir"), &child_dir));
-
-  operation()->ReadDirectory(parent_dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationStatusNotSet, mock_client_->status());
-  EXPECT_EQ(2u, mock_client_->entries().size());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  for (size_t i = 0; i < mock_client_->entries().size(); ++i) {
-    if (mock_client_->entries()[i].is_directory)
-      EXPECT_EQ(child_dir.BaseName().value(), mock_client_->entries()[i].name);
-    else
-      EXPECT_EQ(child_file.BaseName().value(), mock_client_->entries()[i].name);
-  }
-}
-
-TEST_F(FileSystemOperationTest, TestRemoveFailure) {
-  // Path doesn't exist.
-  FilePath nonexisting(base_.path().Append(
-      FILE_PATH_LITERAL("NonExistingDir")));
-  file_util::EnsureEndsWithSeparator(&nonexisting);
-
-  operation()->Remove(nonexisting);
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorNotFound, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-
-  // By spec recursive is always false. Non-empty dir should fail.
-  //      parent_dir
-  //       |       |
-  //  child_dir  child_file
-  // Verify deleting parent_dir.
-  ScopedTempDir parent_dir;
-  ASSERT_TRUE(parent_dir.CreateUniqueTempDir());
-  FilePath child_file;
-  file_util::CreateTemporaryFileInDir(parent_dir.path(), &child_file);
-  FilePath child_dir;
-  ASSERT_TRUE(file_util::CreateTemporaryDirInDir(parent_dir.path(),
-      FILE_PATH_LITERAL("child_dir"), &child_dir));
-
-  operation()->Remove(parent_dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(WebKit::WebFileErrorInvalidModification, mock_client_->status());
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}
-
-TEST_F(FileSystemOperationTest, TestRemoveSuccess) {
-  ScopedTempDir empty_dir;
-  ASSERT_TRUE(empty_dir.CreateUniqueTempDir());
-  EXPECT_TRUE(file_util::DirectoryExists(empty_dir.path()));
-
-  operation()->Remove(empty_dir.path());
-  loop_.RunAllPending();
-  EXPECT_EQ(kFileOperationSucceeded, mock_client_->status());
-  EXPECT_FALSE(file_util::DirectoryExists(empty_dir.path()));
-  EXPECT_EQ(current_request_id_, mock_client_->request_id());
-}