| Index: ppapi/proxy/ppb_file_ref_proxy.cc
|
| diff --git a/ppapi/proxy/ppb_file_ref_proxy.cc b/ppapi/proxy/ppb_file_ref_proxy.cc
|
| index 0cf26bdbe318aa3b86246b35799b352def2eac79..49a113195d309180654293ea37f3cfda3a685961 100644
|
| --- a/ppapi/proxy/ppb_file_ref_proxy.cc
|
| +++ b/ppapi/proxy/ppb_file_ref_proxy.cc
|
| @@ -24,15 +24,6 @@ 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);
|
| @@ -111,25 +102,13 @@ int32_t FileRef::Rename(PP_Resource new_file_ref,
|
| 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) {
|
| @@ -179,7 +158,7 @@ PP_Resource PPB_FileRef_Proxy::DeserializeFileRef(
|
| 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(
|
|
|