Fix AsyncFileTestHelper::ReadDirectory to handle has_more correctly

content/public/test/async_file_test_helper.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "content/public/test/async_file_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/file_system_backend.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace content {
 
 typedef fileapi::FileSystemOperation::FileEntryList FileEntryList;
 
+namespace {
+
 void AssignAndQuit(base::RunLoop* run_loop,
                    base::File::Error* result_out,
                    base::File::Error result) {
   *result_out = result;
   run_loop->Quit();
 }
 
 base::Callback<void(base::File::Error)>
 AssignAndQuitCallback(base::RunLoop* run_loop,
                       base::File::Error* result) {
@@ skipping 26 matching lines @@
   run_loop->Quit();
 }
 
 void ReadDirectoryCallback(base::RunLoop* run_loop,
                            base::File::Error* result_out,
                            FileEntryList* entries_out,
                            base::File::Error result,
                            const FileEntryList& entries,
                            bool has_more) {
   *result_out = result;
-  *entries_out = entries;
+  entries_out->insert(entries_out->end(), entries.begin(), entries.end());
   if (result != base::File::FILE_OK || !has_more)
     run_loop->Quit();
 }
 
 void DidGetUsageAndQuota(quota::QuotaStatusCode* status_out,
                          int64* usage_out,
                          int64* quota_out,
                          quota::QuotaStatusCode status,
                          int64 usage,
                          int64 quota) {
   if (status_out)
     *status_out = status;
   if (usage_out)
     *usage_out = usage;
   if (quota_out)
     *quota_out = quota;
 }
 
+}  // namespace
+
 const int64 AsyncFileTestHelper::kDontCheckSize = -1;
 
 base::File::Error AsyncFileTestHelper::Copy(
     fileapi::FileSystemContext* context,
     const fileapi::FileSystemURL& src,
     const fileapi::FileSystemURL& dest) {
   return CopyWithProgress(context, src, dest, CopyProgressCallback());
 }
 
 base::File::Error AsyncFileTestHelper::CopyWithProgress(
@@ skipping 160 matching lines @@
   quota::QuotaStatusCode status = quota::kQuotaStatusUnknown;
   quota_manager->GetUsageAndQuota(
       origin,
       FileSystemTypeToQuotaStorageType(type),
       base::Bind(&DidGetUsageAndQuota, &status, usage, quota));
   base::RunLoop().RunUntilIdle();
   return status;
 }
 
 }  // namespace fileapi