Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

ppapi/cpp/directory_entry.h

Index: ppapi/cpp/directory_entry.h
diff --git a/ppapi/cpp/dev/directory_entry_dev.h b/ppapi/cpp/directory_entry.h
similarity index 56%
rename from ppapi/cpp/dev/directory_entry_dev.h
rename to ppapi/cpp/directory_entry.h
index 9866213cb7948e7c5d09b145cf6c9234cd7a4310..8134fef7f641b9a308c96fe1e778a89c6771393d 100644
--- a/ppapi/cpp/dev/directory_entry_dev.h
+++ b/ppapi/cpp/directory_entry.h
@@ -2,23 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_CPP_DEV_DIRECTORY_ENTRY_DEV_H_
-#define PPAPI_CPP_DEV_DIRECTORY_ENTRY_DEV_H_
+#ifndef PPAPI_CPP_DIRECTORY_ENTRY_H_
+#define PPAPI_CPP_DIRECTORY_ENTRY_H_
 
-#include "ppapi/c/dev/ppb_directory_reader_dev.h"
+#include "ppapi/c/pp_directory_entry.h"
 #include "ppapi/cpp/file_ref.h"
 
 namespace pp {
 
-class DirectoryEntry_Dev {
+class DirectoryEntry {
  public:
-  DirectoryEntry_Dev();
-  DirectoryEntry_Dev(PassRef, const PP_DirectoryEntry_Dev& data);
-  DirectoryEntry_Dev(const DirectoryEntry_Dev& other);
+  DirectoryEntry();
+  DirectoryEntry(PassRef, const PP_DirectoryEntry& data);
+  DirectoryEntry(const DirectoryEntry& other);
 
-  ~DirectoryEntry_Dev();
+  ~DirectoryEntry();
 
-  DirectoryEntry_Dev& operator=(const DirectoryEntry_Dev& other);
+  DirectoryEntry& operator=(const DirectoryEntry& other);
 
   // Returns true if the DirectoryEntry is invalid or uninitialized.
   bool is_null() const { return !data_.file_ref; }
@@ -30,9 +30,9 @@ class DirectoryEntry_Dev {
   PP_FileType file_type() const { return data_.file_type; }
 
  private:
-  PP_DirectoryEntry_Dev data_;
+  PP_DirectoryEntry data_;
 };
 
 }  // namespace pp
 
-#endif  // PPAPI_CPP_DEV_DIRECTORY_ENTRY_DEV_H_
+#endif  // PPAPI_CPP_DIRECTORY_ENTRY_H_