Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

native_client_sdk/src/libraries/nacl_io_test/mount_html5fs_test.cc

 /* Copyright (c) 2012 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 <fcntl.h>
 #include <string.h>
 #include <gmock/gmock.h>
 #include <ppapi/c/ppb_file_io.h>
+#include <ppapi/c/pp_directory_entry.h>
 #include <ppapi/c/pp_errors.h>
 #include <ppapi/c/pp_instance.h>
 #if defined(WIN32)
 #include <windows.h>  // For Sleep()
 #endif
 
 #include "mock_util.h"
 #include "nacl_io/mount_html5fs.h"
 #include "nacl_io/osdirent.h"
 #include "pepper_interface_mock.h"
@@ skipping 146 matching lines @@
 };
 
 void MountHtml5FsNodeSyncTest::SetUp() {
   MountHtml5FsNodeTest::SetUp();
   SetUpFilesystemExpectations(PP_FILESYSTEMTYPE_LOCALPERSISTENT, 0);
   InitFilesystem();
   SetUpNodeExpectations();
   InitNode();
 }
 
-void ReadEntriesAction(const PP_ArrayOutput& output) {
+void ReadDirectoryEntriesAction(const PP_ArrayOutput& output) {
   const int fileref_resource_1 = 238;
   const int fileref_resource_2 = 239;
 
-  std::vector<PP_DirectoryEntry_Dev> entries;
-  PP_DirectoryEntry_Dev entry1 = { fileref_resource_1, PP_FILETYPE_REGULAR };
-  PP_DirectoryEntry_Dev entry2 = { fileref_resource_2, PP_FILETYPE_REGULAR };
+  std::vector<PP_DirectoryEntry> entries;
+  PP_DirectoryEntry entry1 = { fileref_resource_1, PP_FILETYPE_REGULAR };
+  PP_DirectoryEntry entry2 = { fileref_resource_2, PP_FILETYPE_REGULAR };
   entries.push_back(entry1);
   entries.push_back(entry2);
 
   void* dest = output.GetDataBuffer(
-      output.user_data, 2, sizeof(PP_DirectoryEntry_Dev));
-  memcpy(dest, &entries[0], sizeof(PP_DirectoryEntry_Dev) * 2);
+      output.user_data, 2, sizeof(PP_DirectoryEntry));
+  memcpy(dest, &entries[0], sizeof(PP_DirectoryEntry) * 2);
 }
 
 class MountHtml5FsNodeAsyncTest : public MountHtml5FsNodeTest {
  public:
   virtual void SetUp();
   virtual void TearDown();
 
  private:
   static void* ThreadThunk(void* param);
   void Thread();
@@ skipping 198 matching lines @@
 TEST_F(MountHtml5FsNodeSyncTest, Truncate) {
   const int size = 123;
   EXPECT_CALL(*fileio_, SetLength(fileio_resource_, size, _))
       .WillOnce(Return(int32_t(PP_OK)));
 
   int result = node_->Truncate(size);
   EXPECT_EQ(0, result);
 }
 
 TEST_F(MountHtml5FsNodeSyncTest, GetDents) {
-  const int dir_reader_resource = 237;
   const int fileref_resource_1 = 238;
   const int fileref_resource_2 = 239;
 
   const int fileref_name_id_1 = 240;
   const char fileref_name_cstr_1[] = "bar";
   PP_Var fileref_name_1;
   fileref_name_1.type = PP_VARTYPE_STRING;
   fileref_name_1.value.as_id = fileref_name_id_1;
 
   const int fileref_name_id_2 = 241;
   const char fileref_name_cstr_2[] = "quux";
   PP_Var fileref_name_2;
   fileref_name_2.type = PP_VARTYPE_STRING;
   fileref_name_2.value.as_id = fileref_name_id_2;
 
   VarInterfaceMock* var = ppapi_->GetVarInterface();
-  DirectoryReaderInterfaceMock* dir_reader =
-      ppapi_->GetDirectoryReaderInterface();
 
-  EXPECT_CALL(*dir_reader, Create(fileref_resource_))
-      .WillOnce(Return(dir_reader_resource));
-  EXPECT_CALL(*dir_reader, ReadEntries(dir_reader_resource, _, _))
-      .WillOnce(DoAll(WithArgs<1>(Invoke(ReadEntriesAction)),
+  EXPECT_CALL(*fileref_, ReadDirectoryEntries(fileref_resource_, _, _))
+      .WillOnce(DoAll(WithArgs<1>(Invoke(ReadDirectoryEntriesAction)),
                       Return(int32_t(PP_OK))));
 
   EXPECT_CALL(*fileref_, GetName(fileref_resource_1))
       .WillOnce(Return(fileref_name_1));
   EXPECT_CALL(*fileref_, GetName(fileref_resource_2))
       .WillOnce(Return(fileref_name_2));
 
   EXPECT_CALL(*var, VarToUtf8(IsEqualToVar(fileref_name_1), _))
       .WillOnce(Return(fileref_name_cstr_1));
   EXPECT_CALL(*var, VarToUtf8(IsEqualToVar(fileref_name_2), _))
       .WillOnce(Return(fileref_name_cstr_2));
 
-  EXPECT_CALL(*ppapi_, ReleaseResource(dir_reader_resource));
   EXPECT_CALL(*ppapi_, ReleaseResource(fileref_resource_1));
   EXPECT_CALL(*ppapi_, ReleaseResource(fileref_resource_2));
 
   struct dirent dirents[2];
   memset(&dirents[0], 0, sizeof(dirents));
   int result = node_->GetDents(0, &dirents[0], sizeof(dirent) * 2);
 
   EXPECT_EQ(0, result);
   EXPECT_STREQ(&fileref_name_cstr_1[0], &dirents[0].d_name[0]);
   EXPECT_STREQ(&fileref_name_cstr_2[0], &dirents[1].d_name[0]);
 }