Revert 106717 - Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154)

ppapi/proxy/ppb_file_ref_proxy.h

Index: ppapi/proxy/ppb_file_ref_proxy.h
===================================================================
--- ppapi/proxy/ppb_file_ref_proxy.h	(revision 106763)
+++ ppapi/proxy/ppb_file_ref_proxy.h	(working copy)
@@ -11,7 +11,9 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_time.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
+#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 
 struct PPB_FileRef_Dev;
 
@@ -59,24 +61,36 @@
 
  private:
   // Message handlers.
-  void OnMsgCreate(const ppapi::HostResource& file_system,
+  void OnMsgCreate(const HostResource& file_system,
                    const std::string& path,
                    PPB_FileRef_CreateInfo* result);
-  void OnMsgGetParent(const ppapi::HostResource& host_resource,
+  void OnMsgGetParent(const HostResource& host_resource,
                       PPB_FileRef_CreateInfo* result);
-  void OnMsgMakeDirectory(const ppapi::HostResource& host_resource,
+  void OnMsgMakeDirectory(const HostResource& host_resource,
                           PP_Bool make_ancestors,
-                          uint32_t serialized_callback);
-  void OnMsgTouch(const ppapi::HostResource& host_resource,
+                          int callback_id);
+  void OnMsgTouch(const HostResource& host_resource,
                   PP_Time last_access,
                   PP_Time last_modified,
-                  uint32_t serialized_callback);
-  void OnMsgDelete(const ppapi::HostResource& host_resource,
-                   uint32_t serialized_callback);
-  void OnMsgRename(const ppapi::HostResource& file_ref,
-                   const ppapi::HostResource& new_file_ref,
-                   uint32_t serialized_callback);
+                  int callback_id);
+  void OnMsgDelete(const HostResource& host_resource,
+                   int callback_id);
+  void OnMsgRename(const HostResource& file_ref,
+                   const HostResource& new_file_ref,
+                   int callback_id);
 
+  // Host -> Plugin message handlers.
+  void OnMsgCallbackComplete(const HostResource& host_resource,
+                             int callback_id,
+                             int32_t result);
+
+  void OnCallbackCompleteInHost(int32_t result,
+                                const HostResource& host_resource,
+                                int callback_id);
+
+  pp::CompletionCallbackFactory<PPB_FileRef_Proxy,
+                                ProxyNonThreadSafeRefCount> callback_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(PPB_FileRef_Proxy);
 };