This patch tries to remove most of the manual registration for Pepper interfaces, and replaces it...

ppapi/proxy/ppb_file_ref_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_file_ref_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/private/ppb_proxy_private.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/file_ref_impl.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::EnterFunctionNoLock;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_FileRef_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace ppapi {
 namespace proxy {
 
-namespace {
-
-InterfaceProxy* CreateFileRefProxy(Dispatcher* dispatcher,
-                                   const void* target_interface) {
-  return new PPB_FileRef_Proxy(dispatcher, target_interface);
-}
-
-}  // namespace
-
 class FileRef : public FileRefImpl {
  public:
   explicit FileRef(const PPB_FileRef_CreateInfo& info);
   virtual ~FileRef();
 
   // PPB_FileRef_API implementation (not provided by FileRefImpl).
   virtual PP_Resource GetParent() OVERRIDE;
   virtual int32_t MakeDirectory(PP_Bool make_ancestors,
                                 PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Touch(PP_Time last_access_time,
@@ skipping 58 matching lines @@
       new_file_ref_object->host_resource().instance() != pp_instance())
     return PP_ERROR_BADRESOURCE;
 
   GetDispatcher()->Send(new PpapiHostMsg_PPBFileRef_Rename(
       INTERFACE_ID_PPB_FILE_REF, host_resource(),
       new_file_ref_object->host_resource(),
       GetDispatcher()->callback_tracker().SendCallback(callback)));
   return PP_OK_COMPLETIONPENDING;
 }
 
-PPB_FileRef_Proxy::PPB_FileRef_Proxy(Dispatcher* dispatcher,
-                                     const void* target_interface)
-    : InterfaceProxy(dispatcher, target_interface) {
+PPB_FileRef_Proxy::PPB_FileRef_Proxy(Dispatcher* dispatcher)
+    : InterfaceProxy(dispatcher) {
 }
 
 PPB_FileRef_Proxy::~PPB_FileRef_Proxy() {
 }
 
-const InterfaceProxy::Info* PPB_FileRef_Proxy::GetInfo() {
-  static const Info info = {
-    thunk::GetPPB_FileRef_Thunk(),
-    PPB_FILEREF_INTERFACE,
-    INTERFACE_ID_PPB_FILE_REF,
-    false,
-    &CreateFileRefProxy,
-  };
-  return &info;
-}
-
 // static
 PP_Resource PPB_FileRef_Proxy::CreateProxyResource(PP_Resource file_system,
                                                    const char* path) {
   Resource* file_system_object =
       PluginResourceTracker::GetInstance()->GetResource(file_system);
   if (!file_system_object)
     return 0;
 
   PPB_FileRef_CreateInfo create_info;
   PluginDispatcher::GetForResource(file_system_object)->Send(
@@ skipping 29 matching lines @@
 PP_Resource PPB_FileRef_Proxy::DeserializeFileRef(
     const PPB_FileRef_CreateInfo& serialized) {
   if (serialized.resource.is_null())
     return 0;  // Resource invalid.
   return (new FileRef(serialized))->GetReference();
 }
 
 void PPB_FileRef_Proxy::OnMsgCreate(const HostResource& file_system,
                                     const std::string& path,
                                     PPB_FileRef_CreateInfo* result) {
-  EnterFunctionNoLock<ResourceCreationAPI> enter(file_system.instance(), true);
+  thunk::EnterResourceCreation enter(file_system.instance());
   if (enter.failed())
     return;
   PP_Resource resource = enter.functions()->CreateFileRef(
       file_system.host_resource(), path.c_str());
   if (!resource)
     return;  // CreateInfo default constructor initializes to 0.
   SerializeFileRef(resource, result);
 }
 
 void PPB_FileRef_Proxy::OnMsgGetParent(const HostResource& host_resource,
@@ skipping 47 matching lines @@
     return;
   PP_CompletionCallback callback = ReceiveCallback(serialized_callback);
   int32_t result = enter.object()->Rename(new_file_ref.host_resource(),
                                           callback);
   if (result != PP_OK_COMPLETIONPENDING)
     PP_RunCompletionCallback(&callback, result);
 }
 
 }  // namespace proxy
 }  // namespace ppapi