Index: ppapi/tests/test_directory_reader.cc |
diff --git a/ppapi/tests/test_directory_reader.cc b/ppapi/tests/test_directory_reader.cc |
index c0a65d06e423f2c14d97395ee5a437a9bb230d51..fd385778933c8e80dfbfa42e31bb7045833c3248 100644 |
--- a/ppapi/tests/test_directory_reader.cc |
+++ b/ppapi/tests/test_directory_reader.cc |
@@ -10,8 +10,8 @@ |
#include "ppapi/c/pp_errors.h" |
#include "ppapi/c/ppb_file_io.h" |
-#include "ppapi/cpp/dev/directory_entry_dev.h" |
-#include "ppapi/cpp/dev/directory_reader_dev.h" |
+#include "ppapi/cpp/directory_entry.h" |
+#include "ppapi/cpp/directory_reader.h" |
#include "ppapi/cpp/file_io.h" |
#include "ppapi/cpp/file_ref.h" |
#include "ppapi/cpp/file_system.h" |
@@ -23,7 +23,7 @@ REGISTER_TEST_CASE(DirectoryReader); |
namespace { |
-typedef std::vector<pp::DirectoryEntry_Dev> Entries; |
+typedef std::vector<pp::DirectoryEntry> Entries; |
std::string IntegerToString(int value) { |
char result[12]; |
@@ -49,7 +49,7 @@ int32_t TestDirectoryReader::DeleteDirectoryRecursively(pp::FileRef* dir) { |
TestCompletionCallbackWithOutput<Entries> output_callback( |
instance_->pp_instance(), callback_type()); |
- pp::DirectoryReader_Dev directory_reader(*dir); |
+ pp::DirectoryReader directory_reader(*dir); |
output_callback.WaitForResult( |
directory_reader.ReadEntries(output_callback.GetCallback())); |
int32_t rv = output_callback.result(); |
@@ -131,7 +131,7 @@ std::string TestDirectoryReader::TestReadEntries() { |
TestCompletionCallbackWithOutput<Entries> output_callback( |
instance_->pp_instance(), callback_type()); |
- pp::DirectoryReader_Dev directory_reader(test_dir); |
+ pp::DirectoryReader directory_reader(test_dir); |
output_callback.WaitForResult( |
directory_reader.ReadEntries(output_callback.GetCallback())); |
CHECK_CALLBACK_BEHAVIOR(output_callback); |
@@ -172,7 +172,7 @@ std::string TestDirectoryReader::TestReadEntries() { |
{ |
// Note that the directory reader will be deleted immediately. |
- rv = pp::DirectoryReader_Dev(test_dir).ReadEntries( |
+ rv = pp::DirectoryReader(test_dir).ReadEntries( |
output_callback.GetCallback()); |
} |
output_callback.WaitForAbortResult(rv); |