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

ppapi/proxy/ppb_file_ref_proxy.h

 // Copyright (c) 2011 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.
 
 #ifndef PPAPI_PROXY_PPB_FILE_REF_PROXY_H_
 #define PPAPI_PROXY_PPB_FILE_REF_PROXY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #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;
 
 namespace ppapi {
 
 class HostResource;
 struct PPB_FileRef_CreateInfo;
 
 namespace proxy {
 
@@ skipping 27 matching lines @@
   //
   // Various PPAPI functions return file refs from various interfaces, so this
   // function is public so anybody can receive a file ref.
   static PP_Resource DeserializeFileRef(
       const PPB_FileRef_CreateInfo& serialized);
 
   static const ApiID kApiID = API_ID_PPB_FILE_REF;
 
  private:
   // Message handlers.
-  void OnMsgCreate(const HostResource& file_system,
+  void OnMsgCreate(const ppapi::HostResource& file_system,
                    const std::string& path,
                    PPB_FileRef_CreateInfo* result);
-  void OnMsgGetParent(const HostResource& host_resource,
+  void OnMsgGetParent(const ppapi::HostResource& host_resource,
                       PPB_FileRef_CreateInfo* result);
-  void OnMsgMakeDirectory(const HostResource& host_resource,
+  void OnMsgMakeDirectory(const ppapi::HostResource& host_resource,
                           PP_Bool make_ancestors,
-                          int callback_id);
-  void OnMsgTouch(const HostResource& host_resource,
+                          uint32_t serialized_callback);
+  void OnMsgTouch(const ppapi::HostResource& host_resource,
                   PP_Time last_access,
                   PP_Time last_modified,
-                  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_;
+                  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);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_FileRef_Proxy);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_FILE_REF_PROXY_H_