Cleanup: Deprecate FileSystemCallbackDispatcher

content/renderer/pepper/pepper_file_io_host.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 "content/renderer/pepper/pepper_file_io_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util_proxy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/pepper/null_file_system_callback_dispatcher.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/thunk/enter.h"
-#include "webkit/plugins/ppapi/file_callbacks.h"
 #include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/quota_file_io.h"
 
 namespace content {
 
 using ppapi::FileIOStateManager;
 using ppapi::PPTimeToTime;
 using ppapi::TimeToPPTime;
 using ppapi::host::ReplyMessageContext;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
 using webkit::ppapi::PPB_FileRef_Impl;
 using webkit::ppapi::PluginDelegate;
 
 namespace {
 
 // The maximum size we'll support reading in one chunk. The renderer process
 // must allocate a buffer sized according to the request of the plugin. To
 // keep things from getting out of control, we cap the read size to this value.
 // This should generally be OK since the API specifies that it may perform a
 // partial read.
 static const int32_t kMaxReadSize = 32 * 1024 * 1024;  // 32MB
 
 typedef base::Callback<void (base::PlatformFileError)> PlatformGeneralCallback;
 
-class PlatformGeneralCallbackTranslator
-    : public NullFileSystemCallbackDispatcher {
- public:
-  explicit PlatformGeneralCallbackTranslator(
-      const PlatformGeneralCallback& callback)
-    : callback_(callback) {}
-
-  virtual ~PlatformGeneralCallbackTranslator() {}
-
-  virtual void DidSucceed() OVERRIDE {
-    callback_.Run(base::PLATFORM_FILE_OK);
-  }
-
-  virtual void DidFail(base::PlatformFileError platform_error) OVERRIDE {
-    callback_.Run(platform_error);
-  }
-
- private:
-  PlatformGeneralCallback callback_;
-};
-
 int32_t ErrorOrByteNumber(int32_t pp_error, int32_t byte_number) {
   // On the plugin side, some callbacks expect a parameter that means different
   // things depending on whether is negative or not.  We translate for those
   // callbacks here.
   return pp_error == PP_OK ? byte_number : pp_error;
 }
 
 }  // namespace
 
 PepperFileIOHost::PepperFileIOHost(RendererPpapiHost* host,
@@ skipping 134 matching lines @@
     return rv;
 
   if (!plugin_delegate_)
     return PP_ERROR_FAILED;
 
   if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL) {
     if (!plugin_delegate_->Touch(
             file_system_url_,
             PPTimeToTime(last_access_time),
             PPTimeToTime(last_modified_time),
-            new PlatformGeneralCallbackTranslator(
-                base::Bind(&PepperFileIOHost::ExecutePlatformGeneralCallback,
-                           weak_factory_.GetWeakPtr(),
-                           context->MakeReplyMessageContext()))))
+            base::Bind(&PepperFileIOHost::ExecutePlatformGeneralCallback,
+                        weak_factory_.GetWeakPtr(),
+                        context->MakeReplyMessageContext())))
       return PP_ERROR_FAILED;
     state_manager_.SetPendingOperation(FileIOStateManager::OPERATION_EXCLUSIVE);
     return PP_OK_COMPLETIONPENDING;
   }
 
   // TODO(nhiroki): fix a failure of FileIO.Touch for an external filesystem on
   // Mac and Linux due to sandbox restrictions (http://crbug.com/101128).
   if (!base::FileUtilProxy::Touch(
           plugin_delegate_->GetFileThreadMessageLoopProxy(),
           file_, PPTimeToTime(last_access_time),
@@ skipping 81 matching lines @@
       FileIOStateManager::OPERATION_EXCLUSIVE, true);
   if (rv != PP_OK)
     return rv;
 
   if (!plugin_delegate_)
     return PP_ERROR_FAILED;
 
   if (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL) {
     if (!plugin_delegate_->SetLength(
             file_system_url_, length,
-            new PlatformGeneralCallbackTranslator(
-                base::Bind(&PepperFileIOHost::ExecutePlatformGeneralCallback,
-                           weak_factory_.GetWeakPtr(),
-                           context->MakeReplyMessageContext()))))
+            base::Bind(&PepperFileIOHost::ExecutePlatformGeneralCallback,
+                       weak_factory_.GetWeakPtr(),
+                       context->MakeReplyMessageContext())))
       return PP_ERROR_FAILED;
   } else {
     // TODO(nhiroki): fix a failure of FileIO.SetLength for an external
     // filesystem on Mac due to sandbox restrictions (http://crbug.com/156077).
     if (!base::FileUtilProxy::Truncate(
             plugin_delegate_->GetFileThreadMessageLoopProxy(), file_, length,
             base::Bind(&PepperFileIOHost::ExecutePlatformGeneralCallback,
                        weak_factory_.GetWeakPtr(),
                        context->MakeReplyMessageContext())))
       return PP_ERROR_FAILED;
@@ skipping 213 matching lines @@
   // On the plugin side, the callback expects a parameter with different meaning
   // depends on whether is negative or not. It is the result here. We translate
   // for the callback.
   int32_t pp_error = ::ppapi::PlatformFileErrorToPepperError(error_code);
   reply_context.params.set_result(ErrorOrByteNumber(pp_error, bytes_written));
   host()->SendReply(reply_context, PpapiPluginMsg_FileIO_GeneralReply());
   state_manager_.SetOperationFinished();
 }
 
 }  // namespace content