1 files changed, 4 insertions, 19 deletions
diff --git a/ppapi/proxy/directory_reader_resource.h b/ppapi/proxy/directory_reader_resource.h
index b79993a..e532414 100644
--- a/ppapi/proxy/directory_reader_resource.h
+++ b/ppapi/proxy/directory_reader_resource.h
@@ -5,16 +5,15 @@
 #ifndef PPAPI_PROXY_DIRECTORY_READER_RESOURCE_H_
 #define PPAPI_PROXY_DIRECTORY_READER_RESOURCE_H_
 
-#include <queue>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
+#include "ppapi/shared_impl/array_writer.h"
 #include "ppapi/shared_impl/ppb_file_ref_shared.h"
 #include "ppapi/shared_impl/resource.h"
-#include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/thunk/ppb_directory_reader_api.h"
 
 namespace ppapi {
@@ -36,32 +35,18 @@ class PPAPI_PROXY_EXPORT DirectoryReaderResource
   virtual thunk::PPB_DirectoryReader_API* AsPPB_DirectoryReader_API() OVERRIDE;
 
   // PPB_DirectoryReader_API.
-  virtual int32_t GetNextEntry(
-      PP_DirectoryEntry_Dev* entry,
+  virtual int32_t ReadEntries(
+      const PP_ArrayOutput& output,
       scoped_refptr<TrackedCallback> callback) OVERRIDE;
 
  private:
-  struct DirectoryEntry {
-    ScopedPPResource file_resource;
-    PP_FileType file_type;
-  };
-
   void OnPluginMsgGetEntriesReply(
+      const PP_ArrayOutput& output,
       const ResourceMessageReplyParams& params,
       const std::vector<ppapi::PPB_FileRef_CreateInfo>& infos,
       const std::vector<PP_FileType>& file_types);
 
-  // Fills up an output with the next entry in the directory. If the plugin
-  // resource did not receive directory entries from the host side, returns
-  // false.
-  bool FillUpEntry();
-
   scoped_refptr<Resource> directory_resource_;
-  std::queue<DirectoryEntry> entries_;
-
-  PP_DirectoryEntry_Dev* output_;
-  bool did_receive_get_entries_reply_;
-
   scoped_refptr<TrackedCallback> callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryReaderResource);