PPAPI: Move PPB_DirectoryReader_Dev to stable (won't commit)

ppapi/tests/test_directory_reader.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/tests/test_directory_reader.h"
 
 #include <stdio.h>
 #include <set>
 #include <vector>
 
 #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"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
 
 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];
   sprintf(result, "%d", value);
   return result;
 }
 
 }  // namespace
 
 bool TestDirectoryReader::Init() {
   return CheckTestingInterface() && EnsureRunningOverHTTP();
 }
 
 void TestDirectoryReader::RunTests(const std::string& filter) {
   RUN_CALLBACK_TEST(TestDirectoryReader, ReadEntries, filter);
 }
 
 int32_t TestDirectoryReader::DeleteDirectoryRecursively(pp::FileRef* dir) {
   if (!dir)
     return PP_ERROR_BADARGUMENT;
 
   TestCompletionCallback callback(instance_->pp_instance(), callback_type());
   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();
   if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
     return rv;
 
   Entries entries = output_callback.output();
   for (Entries::const_iterator it = entries.begin();
        it != entries.end(); ++it) {
     pp::FileRef file_ref = it->file_ref();
@@ skipping 61 matching lines @@
 
     expected_dir_names.insert(buffer);
   }
 
   // Test that |ReadEntries()| is able to fetch all directories and files that
   // we created.
   {
     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);
     ASSERT_EQ(PP_OK, output_callback.result());
 
     Entries entries = output_callback.output();
     size_t sum = expected_file_names.size() + expected_dir_names.size();
     if (entries.size() != sum)
       return "Expected " + IntegerToString(sum) + " entries, got " +
           IntegerToString(entries.size());
@@ skipping 20 matching lines @@
     if (!expected_file_names.empty() || !expected_dir_names.empty())
       return "Expected more file paths.";
   }
 
   // Test cancellation of asynchronous |ReadEntries()|.
   TestCompletionCallbackWithOutput<Entries> output_callback(
       instance_->pp_instance(), callback_type());
   {
 
     // 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);
   CHECK_CALLBACK_BEHAVIOR(output_callback);
 
   PASS();
 }