Revert 100748 - This patch tries to remove most of the manual registration for Pepper interfaces,...

ppapi/proxy/ppb_file_system_proxy.cc

Index: ppapi/proxy/ppb_file_system_proxy.cc
===================================================================
--- ppapi/proxy/ppb_file_system_proxy.cc	(revision 100753)
+++ ppapi/proxy/ppb_file_system_proxy.cc	(working copy)
@@ -27,8 +27,9 @@
 
 namespace {
 
-InterfaceProxy* CreateFileSystemProxy(Dispatcher* dispatcher) {
-  return new PPB_FileSystem_Proxy(dispatcher);
+InterfaceProxy* CreateFileSystemProxy(Dispatcher* dispatcher,
+                                      const void* target_interface) {
+  return new PPB_FileSystem_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
@@ -109,8 +110,9 @@
   PP_RunAndClearCompletionCallback(&current_open_callback_, result);
 }
 
-PPB_FileSystem_Proxy::PPB_FileSystem_Proxy(Dispatcher* dispatcher)
-    : InterfaceProxy(dispatcher),
+PPB_FileSystem_Proxy::PPB_FileSystem_Proxy(Dispatcher* dispatcher,
+                                           const void* target_interface)
+    : InterfaceProxy(dispatcher, target_interface),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
@@ -158,7 +160,7 @@
 void PPB_FileSystem_Proxy::OnMsgCreate(PP_Instance instance,
                                        int type,
                                        HostResource* result) {
-  thunk::EnterResourceCreation enter(instance);
+  EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return;
   PP_Resource resource = enter.functions()->CreateFileSystem(