[fsp] Add support for aborting running operations.

chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc

Index: chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc
similarity index 59%
copy from chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc
copy to chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc
index c4af6106088a6c9412605881343c303d5d25d7d2..bc0723157ea3b2601c39fac60b16d08e0b578ac0 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/close_file_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/abort_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/file_system_provider/operations/close_file.h"
+#include "chrome/browser/chromeos/file_system_provider/operations/abort.h"
 
 #include <string>
 #include <vector>
@@ -10,6 +10,7 @@
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "chrome/browser/chromeos/file_system_provider/operations/test_util.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
 #include "chrome/common/extensions/api/file_system_provider.h"
@@ -26,20 +27,20 @@ namespace {
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const char kFileSystemId[] = "testing-file-system";
 const int kRequestId = 2;
-const int kOpenRequestId = 3;
+const int kOperationRequestId = 3;
 
 }  // namespace
 
-class FileSystemProviderOperationsCloseFileTest : public testing::Test {
+class FileSystemProviderOperationsAbortTest : public testing::Test {
  protected:
-  FileSystemProviderOperationsCloseFileTest() {}
-  virtual ~FileSystemProviderOperationsCloseFileTest() {}
+  FileSystemProviderOperationsAbortTest() {}
+  virtual ~FileSystemProviderOperationsAbortTest() {}
 
   virtual void SetUp() OVERRIDE {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
-                               "" /* display_name */,
+                               "" /* file_system_name */,
                                false /* writable */,
                                base::FilePath() /* mount_path */);
   }
@@ -47,25 +48,24 @@ class FileSystemProviderOperationsCloseFileTest : public testing::Test {
   ProvidedFileSystemInfo file_system_info_;
 };
 
-TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
+TEST_F(FileSystemProviderOperationsAbortTest, Execute) {
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
-  CloseFile close_file(NULL,
-                       file_system_info_,
-                       kOpenRequestId,
-                       base::Bind(&util::LogStatusCallback, &callback_log));
-  close_file.SetDispatchEventImplForTesting(
+  Abort abort(NULL,
+              file_system_info_,
+              kOperationRequestId,
+              base::Bind(&util::LogStatusCallback, &callback_log));
+  abort.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
-  EXPECT_TRUE(close_file.Execute(kRequestId));
+  EXPECT_TRUE(abort.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
-  EXPECT_EQ(
-      extensions::api::file_system_provider::OnCloseFileRequested::kEventName,
-      event->event_name);
+  EXPECT_EQ(extensions::api::file_system_provider::OnAbortRequested::kEventName,
+            event->event_name);
   base::ListValue* event_args = event->event_args.get();
   ASSERT_EQ(1u, event_args->GetSize());
 
@@ -80,64 +80,65 @@ TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
   EXPECT_TRUE(options->GetInteger("requestId", &event_request_id));
   EXPECT_EQ(kRequestId, event_request_id);
 
-  int event_open_request_id = -1;
-  EXPECT_TRUE(options->GetInteger("openRequestId", &event_open_request_id));
-  EXPECT_EQ(kOpenRequestId, event_open_request_id);
+  int event_operation_request_id;
+  EXPECT_TRUE(
+      options->GetInteger("operationRequestId", &event_operation_request_id));
+  EXPECT_EQ(kOperationRequestId, event_operation_request_id);
 }
 
-TEST_F(FileSystemProviderOperationsCloseFileTest, Execute_NoListener) {
+TEST_F(FileSystemProviderOperationsAbortTest, Execute_NoListener) {
   util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
-  CloseFile close_file(NULL,
-                       file_system_info_,
-                       kOpenRequestId,
-                       base::Bind(&util::LogStatusCallback, &callback_log));
-  close_file.SetDispatchEventImplForTesting(
+  Abort abort(NULL,
+              file_system_info_,
+              kOperationRequestId,
+              base::Bind(&util::LogStatusCallback, &callback_log));
+  abort.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
-  EXPECT_FALSE(close_file.Execute(kRequestId));
+  EXPECT_FALSE(abort.Execute(kRequestId));
 }
 
-TEST_F(FileSystemProviderOperationsCloseFileTest, OnSuccess) {
+TEST_F(FileSystemProviderOperationsAbortTest, OnSuccess) {
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
-  CloseFile close_file(NULL,
-                       file_system_info_,
-                       kOpenRequestId,
-                       base::Bind(&util::LogStatusCallback, &callback_log));
-  close_file.SetDispatchEventImplForTesting(
+  Abort abort(NULL,
+              file_system_info_,
+              kOperationRequestId,
+              base::Bind(&util::LogStatusCallback, &callback_log));
+  abort.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
-  EXPECT_TRUE(close_file.Execute(kRequestId));
+  EXPECT_TRUE(abort.Execute(kRequestId));
 
-  close_file.OnSuccess(kRequestId,
-                       scoped_ptr<RequestValue>(new RequestValue()),
-                       false /* has_more */);
+  abort.OnSuccess(kRequestId,
+                  scoped_ptr<RequestValue>(new RequestValue()),
+                  false /* has_more */);
   ASSERT_EQ(1u, callback_log.size());
   EXPECT_EQ(base::File::FILE_OK, callback_log[0]);
 }
 
-TEST_F(FileSystemProviderOperationsCloseFileTest, OnError) {
+TEST_F(FileSystemProviderOperationsAbortTest, OnError) {
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
-  CloseFile close_file(NULL,
-                       file_system_info_,
-                       kOpenRequestId,
-                       base::Bind(&util::LogStatusCallback, &callback_log));
-  close_file.SetDispatchEventImplForTesting(
+  Abort abort(NULL,
+              file_system_info_,
+              kOperationRequestId,
+              base::Bind(&util::LogStatusCallback, &callback_log));
+  abort.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
-  EXPECT_TRUE(close_file.Execute(kRequestId));
+  EXPECT_TRUE(abort.Execute(kRequestId));
 
-  close_file.OnError(kRequestId,
-                     scoped_ptr<RequestValue>(new RequestValue()),
-                     base::File::FILE_ERROR_TOO_MANY_OPENED);
+  abort.OnError(kRequestId,
+                scoped_ptr<RequestValue>(new RequestValue()),
+                base::File::FILE_ERROR_TOO_MANY_OPENED);
   ASSERT_EQ(1u, callback_log.size());
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, callback_log[0]);
 }