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

> Pepper: Move FileRef to the "new" resource proxy.
> 
> This change moves the FileRef implementation from the previous one in the "old"
> resource model (ppb_file_ref_impl.cc) to the "new" resource model
> (pepper_file_ref_host.cc), and from the renderer to the browser.
> 
> As many as possible of the supporting changes were split off to other changes
> to minimize the size of this change. Unfortunately, a lot of changes for
> URLLoader had to be rolled into this change.
> 
> The data structures for CreateInfo have changed, and all users of FileRef have
> to be moved over, which is what causes this change to be so large.
> 
> TBR=dmichael@chromium.org, jschuh@chromium.org, yzshen@chromium.org
> BUG=225441
> 
> Review URL: https://codereview.chromium.org/21966004

TBR=teravest@google.com

Review URL: https://codereview.chromium.org/22903002

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

1 files changed, 17 insertions, 3 deletions

diff --git a/ppapi/thunk/ppb_file_ref_api.h b/ppapi/thunk/ppb_file_ref_api.h
index b473ae2..ba92b63 100644
--- a/ppapi/thunk/ppb_file_ref_api.h
+++ b/ppapi/thunk/ppb_file_ref_api.h
@@ -10,12 +10,11 @@
 #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 FileRefCreateInfo;
+struct PPB_FileRef_CreateInfo;
 class TrackedCallback;
 
 namespace thunk {
@@ -41,10 +40,25 @@ 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 FileRefCreateInfo& GetCreateInfo() const = 0;
+  virtual const PPB_FileRef_CreateInfo& GetCreateInfo() const = 0;
 
   // Private API
   virtual PP_Var GetAbsolutePath() = 0;