Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

ppapi/cpp/directory_entry.cc

Index: ppapi/cpp/directory_entry.cc
diff --git a/ppapi/cpp/dev/directory_entry_dev.cc b/ppapi/cpp/directory_entry.cc
similarity index 71%
rename from ppapi/cpp/dev/directory_entry_dev.cc
rename to ppapi/cpp/directory_entry.cc
index 7d538903bde63dbbfea7b88e6917db80514c575e..c8e2b9db3807c6e87d61fed18adf6bb18dea4d14 100644
--- a/ppapi/cpp/dev/directory_entry_dev.cc
+++ b/ppapi/cpp/directory_entry.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/cpp/dev/directory_entry_dev.h"
+#include "ppapi/cpp/directory_entry.h"
 
 #include <string.h>
 
@@ -11,30 +11,30 @@
 
 namespace pp {
 
-DirectoryEntry_Dev::DirectoryEntry_Dev() {
+DirectoryEntry::DirectoryEntry() {
   memset(&data_, 0, sizeof(data_));
 }
 
-DirectoryEntry_Dev::DirectoryEntry_Dev(
-    PassRef, const PP_DirectoryEntry_Dev& data) {
+DirectoryEntry::DirectoryEntry(
+    PassRef, const PP_DirectoryEntry& data) {
   data_.file_ref = data.file_ref;
   data_.file_type = data.file_type;
 }
 
-DirectoryEntry_Dev::DirectoryEntry_Dev(const DirectoryEntry_Dev& other) {
+DirectoryEntry::DirectoryEntry(const DirectoryEntry& other) {
   data_.file_ref = other.data_.file_ref;
   data_.file_type = other.data_.file_type;
   if (data_.file_ref)
     Module::Get()->core()->AddRefResource(data_.file_ref);
 }
 
-DirectoryEntry_Dev::~DirectoryEntry_Dev() {
+DirectoryEntry::~DirectoryEntry() {
   if (data_.file_ref)
     Module::Get()->core()->ReleaseResource(data_.file_ref);
 }
 
-DirectoryEntry_Dev& DirectoryEntry_Dev::operator=(
-    const DirectoryEntry_Dev& other) {
+DirectoryEntry& DirectoryEntry::operator=(
+    const DirectoryEntry& other) {
   if (data_.file_ref)
     Module::Get()->core()->ReleaseResource(data_.file_ref);
   data_ = other.data_;
@@ -54,19 +54,19 @@ DirectoryEntryArrayOutputAdapterWithStorage::
     ~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();
   }
 }
 
-std::vector<DirectoryEntry_Dev>&
+std::vector<DirectoryEntry>&
     DirectoryEntryArrayOutputAdapterWithStorage::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_;