Correctly handle has_more in PepperInternalFileRefBackend

content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc

 // Copyright 2013 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 "content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 179 matching lines @@
 
   host_->SendReply(reply_context,
                    PpapiPluginMsg_FileRef_QueryReply(pp_file_info));
 }
 
 int32_t PepperInternalFileRefBackend::ReadDirectoryEntries(
     ppapi::host::ReplyMessageContext reply_context) {
   if (!GetFileSystemURL().is_valid())
     return PP_ERROR_FAILED;
 
+  fileapi::FileSystemOperation::FileEntryList* accumulated_file_list
+      = new fileapi::FileSystemOperation::FileEntryList;
   GetFileSystemContext()->operation_runner()->ReadDirectory(
       GetFileSystemURL(),
       base::Bind(&PepperInternalFileRefBackend::ReadDirectoryComplete,
                  weak_factory_.GetWeakPtr(),
-                 reply_context));
+                 reply_context,
+                 base::Owned(accumulated_file_list)));
   return PP_OK_COMPLETIONPENDING;
 }
 
 void PepperInternalFileRefBackend::ReadDirectoryComplete(
     ppapi::host::ReplyMessageContext context,
+    fileapi::FileSystemOperation::FileEntryList* accumulated_file_list,
     base::File::Error error,
     const fileapi::FileSystemOperation::FileEntryList& file_list,
     bool has_more) {
-  // The current filesystem backend always returns false.
-  DCHECK(!has_more);
+  accumulated_file_list->insert(accumulated_file_list->end(),
+                                file_list.begin(), file_list.end());
+  if (has_more)
+    return;
 
   context.params.set_result(ppapi::FileErrorToPepperError(error));
 
   std::vector<ppapi::FileRefCreateInfo> infos;
   std::vector<PP_FileType> file_types;
   if (error == base::File::FILE_OK && fs_host_.get()) {
     std::string dir_path = path_;
     if (dir_path.empty() || dir_path[dir_path.size() - 1] != '/')
       dir_path += '/';
 
     for (fileapi::FileSystemOperation::FileEntryList::const_iterator it =
-         file_list.begin(); it != file_list.end(); ++it) {
+             accumulated_file_list->begin();
+         it != accumulated_file_list->end(); ++it) {
       if (it->is_directory)
         file_types.push_back(PP_FILETYPE_DIRECTORY);
       else
         file_types.push_back(PP_FILETYPE_REGULAR);
 
       ppapi::FileRefCreateInfo info;
       info.file_system_type = fs_type_;
       info.file_system_plugin_resource = fs_host_->pp_resource();
       std::string path =
           dir_path + fileapi::FilePathToString(base::FilePath(it->name));
@@ skipping 54 matching lines @@
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
   if (!policy->CanReadFileSystemFile(render_process_id_, url) ||
       !policy->CanWriteFileSystemFile(render_process_id_, url)) {
     return PP_ERROR_NOACCESS;
   }
   return PP_OK;
 }
 
 }  // namespace content