PPAPI (Flash): Fix FileModuleLocal::GetDirContents().

ppapi/cpp/private/flash_file.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 "ppapi/cpp/private/flash_file.h"
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance_handle.h"
@@ skipping 10 matching lines @@
 }
 
 template <> const char* interface_name<PPB_Flash_File_ModuleLocal_2_0>() {
   return PPB_FLASH_FILE_MODULELOCAL_INTERFACE_2_0;
 }
 
 }  // namespace
 
 namespace flash {
 
+static FileModuleLocal::DirEntry ConvertDirEntry(const PP_DirEntry_Dev& entry) {
+  FileModuleLocal::DirEntry rv = { entry.name, PP_ToBool(entry.is_dir) };
+  return rv;
+}
+
 // static
 bool FileModuleLocal::IsAvailable() {
   return has_interface<PPB_Flash_File_ModuleLocal_3_0>() ||
       has_interface<PPB_Flash_File_ModuleLocal_2_0>();
 }
 
 // static
 bool FileModuleLocal::CreateThreadAdapterForInstance(
     const InstanceHandle& instance) {
   bool rv = false;
@@ skipping 93 matching lines @@
     result = get_interface<PPB_Flash_File_ModuleLocal_2_0>()->
         QueryFile(instance.pp_instance(), path.c_str(), info);
   }
   return result == PP_OK;
 }
 
 // static
 bool FileModuleLocal::GetDirContents(
     const InstanceHandle& instance,
     const std::string& path,
-    std::vector<PP_DirEntry_Dev>* dir_contents) {
+    std::vector<DirEntry>* dir_contents) {
   dir_contents->clear();
 
   int32_t result = PP_ERROR_FAILED;
   if (has_interface<PPB_Flash_File_ModuleLocal_3_0>()) {
     PP_DirContents_Dev* contents = NULL;
     result = get_interface<PPB_Flash_File_ModuleLocal_3_0>()->
         GetDirContents(instance.pp_instance(), path.c_str(), &contents);
     if (result == PP_OK && contents) {
       for (int32_t i = 0; i < contents->count; i++)
-        dir_contents->push_back(contents->entries[i]);
+        dir_contents->push_back(ConvertDirEntry(contents->entries[i]));
     }
     if (contents) {
         get_interface<PPB_Flash_File_ModuleLocal_3_0>()->
             FreeDirContents(instance.pp_instance(), contents);
     }
   } else if (has_interface<PPB_Flash_File_ModuleLocal_2_0>()) {
     PP_DirContents_Dev* contents = NULL;
     result = get_interface<PPB_Flash_File_ModuleLocal_2_0>()->
         GetDirContents(instance.pp_instance(), path.c_str(), &contents);
     if (result == PP_OK && contents) {
       for (int32_t i = 0; i < contents->count; i++)
-        dir_contents->push_back(contents->entries[i]);
+        dir_contents->push_back(ConvertDirEntry(contents->entries[i]));
     }
     if (contents) {
         get_interface<PPB_Flash_File_ModuleLocal_2_0>()->
             FreeDirContents(instance.pp_instance(), contents);
     }
   }
   return result == PP_OK;
 }
 
 // static
@@ skipping 51 matching lines @@
   if (has_interface<PPB_Flash_File_FileRef>()) {
     result = get_interface<PPB_Flash_File_FileRef>()->
         QueryFile(resource.pp_resource(), info);
   }
   return result == PP_OK;
 }
 
 }  // namespace flash
 
 }  // namespace pp