Cleanup: Deprecate FileSystemCallbackDispatcher

webkit/plugins/ppapi/ppb_file_ref_impl.cc

Index: webkit/plugins/ppapi/ppb_file_ref_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
index d6c7ce861cff3480eb57bcab649e198c4a23f094..49a984b5af0ae491e50c8b54c4a178709df58b63 100644
--- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc
@@ -250,7 +250,8 @@ int32_t PPB_FileRef_Impl::MakeDirectory(
     return PP_ERROR_FAILED;
   if (!plugin_instance->delegate()->MakeDirectory(
           GetFileSystemURL(), PP_ToBool(make_ancestors),
-          new FileCallbacks(this, callback)))
+          base::Bind(&FileCallbacks::DidFinish,
+                     base::Owned(new FileCallbacks(this, callback)))))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
@@ -268,7 +269,8 @@ int32_t PPB_FileRef_Impl::Touch(PP_Time last_access_time,
           GetFileSystemURL(),
           PPTimeToTime(last_access_time),
           PPTimeToTime(last_modified_time),
-          new FileCallbacks(this, callback)))
+          base::Bind(&FileCallbacks::DidFinish,
+                     base::Owned(new FileCallbacks(this, callback)))))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
@@ -282,7 +284,8 @@ int32_t PPB_FileRef_Impl::Delete(scoped_refptr<TrackedCallback> callback) {
     return PP_ERROR_FAILED;
   if (!plugin_instance->delegate()->Delete(
           GetFileSystemURL(),
-          new FileCallbacks(this, callback)))
+          base::Bind(&FileCallbacks::DidFinish,
+                     base::Owned(new FileCallbacks(this, callback)))))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
@@ -306,7 +309,8 @@ int32_t PPB_FileRef_Impl::Rename(PP_Resource new_pp_file_ref,
     return PP_ERROR_FAILED;
   if (!plugin_instance->delegate()->Rename(
           GetFileSystemURL(), new_file_ref->GetFileSystemURL(),
-          new FileCallbacks(this, callback)))
+          base::Bind(&FileCallbacks::DidFinish,
+                     base::Owned(new FileCallbacks(this, callback)))))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
@@ -408,11 +412,13 @@ int32_t PPB_FileRef_Impl::QueryInHost(
     if (!delegate)
       return PP_ERROR_FAILED;
 
+    scoped_ptr<FileCallbacks> callbacks(new FileCallbacks(
+        this, callback, info,
+        delegate->GetFileSystemType(pp_instance(), file_system_)));
     if (!plugin_instance->delegate()->Query(
             GetFileSystemURL(),
-            new FileCallbacks(this, callback, info,
-                              delegate->GetFileSystemType(pp_instance(),
-                                                          file_system_))))
+            base::Bind(&FileCallbacks::DidReadMetadata,
+                       base::Owned(callbacks.release()))))
       return PP_ERROR_FAILED;
 
   }
@@ -444,7 +450,8 @@ int32_t PPB_FileRef_Impl::ReadDirectoryEntriesInHost(
 
   if (!plugin_instance->delegate()->ReadDirectoryEntries(
           GetFileSystemURL(),
-          new FileCallbacks(this, callback, params)))
+          base::Bind(&FileCallbacks::DidReadDirectory,
+                     base::Owned(new FileCallbacks(this, callback, params)))))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }