Cleanup: Deprecate FileSystemCallbackDispatcher

webkit/plugins/ppapi/file_callbacks.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 "webkit/plugins/ppapi/file_callbacks.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 39 matching lines @@
     const ReadDirectoryEntriesParams& params)
     : callback_(callback),
       file_system_type_(PP_FILESYSTEMTYPE_INVALID),
       read_entries_dir_ref_(params.dir_ref),
       read_entries_files_(params.files),
       read_entries_file_types_(params.file_types) {
 }
 
 FileCallbacks::~FileCallbacks() {}
 
-void FileCallbacks::DidSucceed() {
+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;
 
-  callback_->Run(PP_OK);
-}
-
-void FileCallbacks::DidReadMetadata(
-    const base::PlatformFileInfo& file_info,
-    const base::FilePath& unused) {
-  if (callback_->completed())
-    return;
-
   DCHECK(info_.get());
   info_->size = file_info.size;
   info_->creation_time = TimeToPPTime(file_info.creation_time);
   info_->last_access_time = TimeToPPTime(file_info.last_accessed);
   info_->last_modified_time = TimeToPPTime(file_info.last_modified);
   info_->system_type = file_system_type_;
   if (file_info.is_directory)
     info_->type = PP_FILETYPE_DIRECTORY;
   else
     info_->type = PP_FILETYPE_REGULAR;
 
   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;
+  }
 
-void FileCallbacks::DidReadDirectory(
-    const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
   if (callback_->completed())
     return;
 
   // The current filesystem backend always returns false.
   DCHECK(!has_more);
 
   DCHECK(read_entries_dir_ref_);
   DCHECK(read_entries_files_.get());
   DCHECK(read_entries_file_types_.get());
 
@@ skipping 11 matching lines @@
     read_entries_file_types_->push_back(
         entry.is_directory ? PP_FILETYPE_DIRECTORY : PP_FILETYPE_REGULAR);
     // Add a ref count on behalf of the plugin side.
     file_ref->GetReference();
   }
   CHECK_EQ(read_entries_files_->size(), read_entries_file_types_->size());
 
   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;
 
   callback_->Run(::ppapi::PlatformFileErrorToPepperError(error_code));
 }
 
 }  // namespace ppapi
 }  // namespace webkit