Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including

webkit/plugins/ppapi/plugin_module.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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 252 matching lines @@
     return ::ppapi::thunk::GetPPB_CharSet_Thunk();
   if (strcmp(name, PPB_CONSOLE_DEV_INTERFACE) == 0)
     return PPB_Console_Impl::GetInterface();
   if (strcmp(name, PPB_CORE_INTERFACE) == 0)
     return &core_interface;
   if (strcmp(name, PPB_CRYPTO_DEV_INTERFACE) == 0)
     return PPB_Crypto_Impl::GetInterface();
   if (strcmp(name, PPB_CURSOR_CONTROL_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_CursorControl_Thunk();
   if (strcmp(name, PPB_DIRECTORYREADER_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_DirectoryReader_Thunk();
+    return PPB_DirectoryReader_Impl::GetInterface();
   if (strcmp(name, PPB_FILECHOOSER_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileChooser_Thunk();
+    return PPB_FileChooser_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIO_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileIO_Thunk();
+    return PPB_FileIO_Impl::GetInterface();
   if (strcmp(name, PPB_NACL_PRIVATE_INTERFACE) == 0)
     return PPB_NaCl_Private_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk();
+    return PPB_FileIO_Impl::GetTrustedInterface();
   if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileRef_Thunk();
+    return PPB_FileRef_Impl::GetInterface();
   if (strcmp(name, PPB_FILESYSTEM_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
+    return PPB_FileSystem_Impl::GetInterface();
   if (strcmp(name, PPB_FIND_DEV_INTERFACE) == 0)
-    return ::ppapi::thunk::GetPPB_Find_Thunk();
+    return PluginInstance::GetFindInterface();
   if (strcmp(name, PPB_FLASH_INTERFACE) == 0)
     return PPB_Flash_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0)
     return PPB_Flash_Clipboard_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0)
     return PPB_Flash_File_FileRef_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
     return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
     return PPB_Flash_Menu_Impl::GetInterface();
@@ skipping 302 matching lines @@
   int retval = entry_points_.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit