Pepper: Move FileRef to the "new" resource proxy.

ppapi/thunk/ppb_file_ref_api.h

Index: ppapi/thunk/ppb_file_ref_api.h
diff --git a/ppapi/thunk/ppb_file_ref_api.h b/ppapi/thunk/ppb_file_ref_api.h
index ba92b63fcc44664ad8bc447283e424094f15efe0..c1b3d5849d3637daa78395d2dfd8c6684fd5ea0e 100644
--- a/ppapi/thunk/ppb_file_ref_api.h
+++ b/ppapi/thunk/ppb_file_ref_api.h
@@ -10,11 +10,12 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/shared_impl/file_ref_create_info.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 
-struct PPB_FileRef_CreateInfo;
+struct PPB_FileRefCreateInfo;

[dmichael (off chromium), 2013/08/08 21:24:03]

I think this needs to be FileRefCreateInfo (you probably got it for free from
one of your includes)

[yzshen1, 2013/08/08 23:16:21]

Is it FileRefCreateInfo (no PPB_)?

[teravest, 2013/08/09 02:00:08]

Done.

 class TrackedCallback;
 
 namespace thunk {
@@ -40,25 +41,10 @@ class PPAPI_THUNK_EXPORT PPB_FileRef_API {
   virtual int32_t ReadDirectoryEntries(
       const PP_ArrayOutput& output,
       scoped_refptr<TrackedCallback> callback) = 0;
-  // We define variants of Query and ReadDirectoryEntries because
-  // 1. we need to take linked_ptr instead of raw pointers to avoid
-  // use-after-free, and 2. we don't use PP_ArrayOutput for the
-  // communication between renderers and the browser in
-  // ReadDirectoryEntries. The *InHost functions must not be called in
-  // plugins, and Query and ReadDirectoryEntries must not be called in
-  // renderers.
-  // TODO(hamaji): These functions must be removed when we move
-  // FileRef to the new resource design. http://crbug.com/225441
-  virtual int32_t QueryInHost(linked_ptr<PP_FileInfo> info,
-                              scoped_refptr<TrackedCallback> callback) = 0;
-  virtual int32_t ReadDirectoryEntriesInHost(
-      linked_ptr<std::vector<ppapi::PPB_FileRef_CreateInfo> > files,
-      linked_ptr<std::vector<PP_FileType> > file_types,
-      scoped_refptr<TrackedCallback> callback) = 0;
 
   // Internal function for use in proxying. Returns the internal CreateInfo
   // (the contained resource does not carry a ref on behalf of the caller).
-  virtual const PPB_FileRef_CreateInfo& GetCreateInfo() const = 0;
+  virtual const FileRefCreateInfo& GetCreateInfo() const = 0;
 
   // Private API
   virtual PP_Var GetAbsolutePath() = 0;