[fsp] Simplify aborting logic.

chrome/browser/chromeos/file_system_provider/provided_file_system.cc

 // Copyright 2014 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/file_system_provider/provided_file_system.h"
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/files/file.h"
@@ skipping 75 matching lines @@
       file_system_info_(file_system_info),
       notification_manager_(
           new NotificationManager(profile_, file_system_info_)),
       request_manager_(new RequestManager(notification_manager_.get())),
       weak_ptr_factory_(this) {
 }
 
 ProvidedFileSystem::~ProvidedFileSystem() {
   const std::vector<int> request_ids = request_manager_->GetActiveRequestIds();
   for (size_t i = 0; i < request_ids.size(); ++i) {
-    Abort(request_ids[i], base::Bind(&EmptyStatusCallback));
+    Abort(request_ids[i]);
   }
 }
 
 void ProvidedFileSystem::SetEventRouterForTesting(
     extensions::EventRouter* event_router) {
   event_router_ = event_router;
 }
 
 void ProvidedFileSystem::SetNotificationManagerForTesting(
     scoped_ptr<NotificationManagerInterface> notification_manager) {
@@ skipping 443 matching lines @@
                                      watcher_it->second,
                                      change_type,
                                      changes_ref,
                                      auto_updater->CreateCallback()));
 }
 
 base::WeakPtr<ProvidedFileSystemInterface> ProvidedFileSystem::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-void ProvidedFileSystem::Abort(
-    int operation_request_id,
-    const storage::AsyncFileUtil::StatusCallback& callback) {
+void ProvidedFileSystem::Abort(int operation_request_id) {
   request_manager_->RejectRequest(operation_request_id,
                                   make_scoped_ptr(new RequestValue()),
                                   base::File::FILE_ERROR_ABORT);
   if (!request_manager_->CreateRequest(
           ABORT,
-          scoped_ptr<RequestManager::HandlerInterface>(
-              new operations::Abort(event_router_,
-                                    file_system_info_,
-                                    operation_request_id,
-                                    callback)))) {
-    callback.Run(base::File::FILE_ERROR_SECURITY);
+          scoped_ptr<RequestManager::HandlerInterface>(new operations::Abort(
+              event_router_, file_system_info_, operation_request_id,
+              base::Bind(&EmptyStatusCallback))))) {
+    LOG(ERROR) << "Failed to create an abort request.";
   }
 }
 
 void ProvidedFileSystem::OnAddWatcherCompleted(
     const base::FilePath& entry_path,
     bool recursive,
     const Subscriber& subscriber,
     const storage::AsyncFileUtil::StatusCallback& callback,
     base::File::Error result) {
   if (result != base::File::FILE_OK) {
@@ skipping 56 matching lines @@
                     recursive,
                     base::Bind(&EmptyStatusCallback));
     }
   }
 
   callback.Run(base::File::FILE_OK);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos