Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

ppapi/cpp/array_output.h

Index: ppapi/cpp/array_output.h
diff --git a/ppapi/cpp/array_output.h b/ppapi/cpp/array_output.h
index 3a52190feac93d6bdba66fbdb49665b748812b31..7818f0796589976a264261bc61d0486855be183f 100644
--- a/ppapi/cpp/array_output.h
+++ b/ppapi/cpp/array_output.h
@@ -7,10 +7,9 @@
 
 #include <vector>
 
-#include "ppapi/c/dev/ppb_directory_reader_dev.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_resource.h"
-#include "ppapi/cpp/dev/directory_entry_dev.h"
+#include "ppapi/cpp/directory_entry.h"
 #include "ppapi/cpp/logging.h"
 #include "ppapi/cpp/pass_ref.h"
 #include "ppapi/cpp/var.h"
@@ -270,7 +269,7 @@ class ResourceArrayOutputAdapterWithStorage
 };
 
 class DirectoryEntryArrayOutputAdapterWithStorage
-    : public ArrayOutputAdapter<PP_DirectoryEntry_Dev> {
+    : public ArrayOutputAdapter<PP_DirectoryEntry> {
  public:
   DirectoryEntryArrayOutputAdapterWithStorage() {
     set_output(&temp_storage_);
@@ -279,35 +278,35 @@ class DirectoryEntryArrayOutputAdapterWithStorage
   virtual ~DirectoryEntryArrayOutputAdapterWithStorage() {
     if (!temp_storage_.empty()) {
       // An easy way to release the resource references held by |temp_storage_|.
-      // A destructor for PP_DirectoryEntry_Dev will release them.
+      // A destructor for PP_DirectoryEntry will release them.
       output();
     }
   };
 
   // Returns the final array of resource objects, converting the
-  // PP_DirectoryEntry_Dev written by the browser to pp::DirectoryEntry_Dev
+  // PP_DirectoryEntry written by the browser to pp::DirectoryEntry
   // objects.
   //
   // This function should only be called once or we would end up converting
   // the array more than once, which would mess up the refcounting.
-  std::vector<pp::DirectoryEntry_Dev>& output() {
+  std::vector<pp::DirectoryEntry>& output() {
     PP_DCHECK(output_storage_.empty());
-    typedef std::vector<PP_DirectoryEntry_Dev> Entries;
+    typedef std::vector<PP_DirectoryEntry> Entries;
     for (Entries::iterator it = temp_storage_.begin();
          it != temp_storage_.end(); ++it)
-      output_storage_.push_back(DirectoryEntry_Dev(PASS_REF, *it));
+      output_storage_.push_back(DirectoryEntry(PASS_REF, *it));
     temp_storage_.clear();
     return output_storage_;
   }
 
  private:
-  // The browser will write the PP_DirectoryEntry_Devs into this array.
-  std::vector<PP_DirectoryEntry_Dev> temp_storage_;
+  // The browser will write the PP_DirectoryEntrys into this array.
+  std::vector<PP_DirectoryEntry> temp_storage_;
 
-  // When asked for the output, the PP_DirectoryEntry_Devs above will be
-  // converted to the pp::DirectoryEntry_Devs in this array for passing to the
+  // When asked for the output, the PP_DirectoryEntrys above will be
+  // converted to the pp::DirectoryEntrys in this array for passing to the
   // calling code.
-  std::vector<pp::DirectoryEntry_Dev> output_storage_;
+  std::vector<pp::DirectoryEntry> output_storage_;
 };
 
 }  // namespace pp