Cleanup: Deprecate FileSystemCallbackDispatcher

webkit/plugins/ppapi/file_callbacks.cc

Index: webkit/plugins/ppapi/file_callbacks.cc
diff --git a/webkit/plugins/ppapi/file_callbacks.cc b/webkit/plugins/ppapi/file_callbacks.cc
index d75def959d3989c5780c33dc6a7ecdc3a361ce4a..2336fdedbb3b64732308124bea5f3531e41c8f14 100644
--- a/webkit/plugins/ppapi/file_callbacks.cc
+++ b/webkit/plugins/ppapi/file_callbacks.cc
@@ -57,16 +57,19 @@ FileCallbacks::FileCallbacks(
 
 FileCallbacks::~FileCallbacks() {}
 
-void FileCallbacks::DidSucceed() {
-  if (callback_->completed())
-    return;
-
-  callback_->Run(PP_OK);
+void FileCallbacks::DidFinish(base::PlatformFileError error_code) {
+  RunCallback(error_code);
 }
 
 void FileCallbacks::DidReadMetadata(
+    base::PlatformFileError error_code,
     const base::PlatformFileInfo& file_info,
     const base::FilePath& unused) {
+  if (error_code != base::PLATFORM_FILE_OK) {
+    RunCallback(error_code);
+    return;
+  }
+
   if (callback_->completed())
     return;
 
@@ -84,14 +87,14 @@ void FileCallbacks::DidReadMetadata(
   callback_->Run(PP_OK);
 }
 
-void FileCallbacks::DidCreateSnapshotFile(
-    const base::PlatformFileInfo& file_info,
-    const base::FilePath& path) {
-  NOTREACHED();
-}
-
 void FileCallbacks::DidReadDirectory(
+    base::PlatformFileError error_code,
     const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {

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

nit: put each parameter on a separate line, please.

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

Done (in ppb_file_ref_impl.cc)

+  if (error_code != base::PLATFORM_FILE_OK) {
+    RunCallback(error_code);
+    return;
+  }
+
   if (callback_->completed())
     return;
 
@@ -123,19 +126,6 @@ void FileCallbacks::DidReadDirectory(
   callback_->Run(PP_OK);
 }
 
-void FileCallbacks::DidOpenFileSystem(const std::string&,
-                                      const GURL& root_url) {
-  NOTREACHED();
-}
-
-void FileCallbacks::DidFail(base::PlatformFileError error_code) {
-  RunCallback(error_code);
-}
-
-void FileCallbacks::DidWrite(int64 bytes, bool complete) {
-  NOTREACHED();
-}
-
 void FileCallbacks::RunCallback(base::PlatformFileError error_code) {
   if (callback_->completed())
     return;