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

the ones starting with "F".

Since this adds a lot more interfaces, I added the macro stuff we used for the
old system to generate the various template specializations. This involded a
lot of renaming since the As* needs to match the name (I was previously leaving
off the "PPB_" part). I did other misc cleanup to the infrastructure.
Review URL: http://codereview.chromium.org/7082036

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/7006022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87438 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 11 deletions

diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.h b/webkit/plugins/ppapi/ppb_file_chooser_impl.h
index 024970f..57d1d32 100644
--- a/webkit/plugins/ppapi/ppb_file_chooser_impl.h
+++ b/webkit/plugins/ppapi/ppb_file_chooser_impl.h
@@ -10,7 +10,6 @@
 
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
-#include "ppapi/thunk/ppb_file_chooser_api.h"
 #include "webkit/plugins/ppapi/resource.h"
 
 struct PP_CompletionCallback;
@@ -22,22 +21,19 @@ class PluginInstance;
 class PPB_FileRef_Impl;
 class TrackedCompletionCallback;
 
-class PPB_FileChooser_Impl : public Resource,
-                             public ::ppapi::thunk::PPB_FileChooser_API {
+class PPB_FileChooser_Impl : public Resource {
  public:
   PPB_FileChooser_Impl(PluginInstance* instance,
                        const PP_FileChooserOptions_Dev* options);
   virtual ~PPB_FileChooser_Impl();
 
-  static PP_Resource Create(PP_Instance instance,
-                            const PP_FileChooserOptions_Dev* options);
+  // Returns a pointer to the interface implementing PPB_FileChooser that is
+  // exposed to the plugin.
+  static const PPB_FileChooser_Dev* GetInterface();
 
   // Resource overrides.
   virtual PPB_FileChooser_Impl* AsPPB_FileChooser_Impl();
 
-  // ResourceObjectBase overrides.
-  virtual ::ppapi::thunk::PPB_FileChooser_API* AsPPB_FileChooser_API() OVERRIDE;
-
   // Stores the list of selected files.
   void StoreChosenFiles(const std::vector<std::string>& files);
 
@@ -52,9 +48,9 @@ class PPB_FileChooser_Impl : public Resource,
 
   void RunCallback(int32_t result);
 
-  // PPB_FileChooser_API implementation.
-  virtual int32_t Show(PP_CompletionCallback callback) OVERRIDE;
-  virtual PP_Resource GetNextChosenFile() OVERRIDE;
+  // PPB_FileChooser implementation.
+  int32_t Show(const PP_CompletionCallback& callback);
+  scoped_refptr<PPB_FileRef_Impl> GetNextChosenFile();
 
  private:
   PP_FileChooserMode_Dev mode_;