Cleanup: Deprecate FileSystemCallbackDispatcher

webkit/plugins/ppapi/file_callbacks.h

Index: webkit/plugins/ppapi/file_callbacks.h
diff --git a/webkit/plugins/ppapi/file_callbacks.h b/webkit/plugins/ppapi/file_callbacks.h
index 2df1c24ddd87bf3ace4b11aaf699ac4b7af67669..756c2c552c3b44ab5acfeea42a41446c017bd0f7 100644
--- a/webkit/plugins/ppapi/file_callbacks.h
+++ b/webkit/plugins/ppapi/file_callbacks.h
@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include "base/files/file_util_proxy.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -17,7 +18,6 @@
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_resource.h"
-#include "webkit/fileapi/file_system_callback_dispatcher.h"
 
 struct PP_FileInfo;
 
@@ -36,8 +36,8 @@ namespace ppapi {
 
 class PPB_FileRef_Impl;
 
-// Instances of this class are deleted by FileSystemDispatcher.
-class FileCallbacks : public fileapi::FileSystemCallbackDispatcher {
+// Callback handler implementation for FileSystem related API.
+class FileCallbacks {

[yzshen1, 2013/05/14 16:50:09]

It seems good to change ppb_file_ref_impl and get rid of this class entirely.

But I am fine if you would like to add a TODO and make it a separate CL later.

[kinuko, 2013/05/15 13:58:03]

Done.

I was going to cut a separate CL, but have integrated it into this one :)

   typedef std::vector< ::ppapi::PPB_FileRef_CreateInfo> CreateInfos;
   typedef std::vector<PP_FileType> FileTypes;
 
@@ -60,20 +60,15 @@ class FileCallbacks : public fileapi::FileSystemCallbackDispatcher {
                 const ReadDirectoryEntriesParams& params);
   virtual ~FileCallbacks();
 
-  // FileSystemCallbackDispatcher implementation.
-  virtual void DidSucceed();
-  virtual void DidReadMetadata(
+  void DidFinish(base::PlatformFileError error_code);
+  void DidReadMetadata(
+      base::PlatformFileError error_code,
       const base::PlatformFileInfo& file_info,
       const base::FilePath& unused);
-  virtual void DidCreateSnapshotFile(
-      const base::PlatformFileInfo& file_info,
-      const base::FilePath& path);
-  virtual void DidReadDirectory(
-      const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more);
-  virtual void DidOpenFileSystem(const std::string&,
-                                 const GURL& root_url);
-  virtual void DidFail(base::PlatformFileError error_code);
-  virtual void DidWrite(int64 bytes, bool complete);
+  void DidReadDirectory(
+      base::PlatformFileError error_code,
+      const std::vector<base::FileUtilProxy::Entry>& entries,
+      bool has_more);
 
   scoped_refptr< ::ppapi::TrackedCallback> GetTrackedCallback() const;