FileAPI: Copy base::FileUtilProxy::Entry to fileapi::DirectoryEntry

webkit/plugins/ppapi/ppb_file_ref_impl.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 "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 
+#include "base/files/file_util_proxy.h"
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/file_type_conversion.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
+#include "webkit/fileapi/directory_entry.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
 
 using ppapi::HostResource;
 using ppapi::PPB_FileRef_CreateInfo;
 using ppapi::PPTimeToTime;
@@ skipping 146 matching lines @@
 
   PlatformFileInfoToPPFileInfo(file_info, file_system_type, info.get());
   callback->Run(PP_OK);
 }
 
 void DidReadDirectory(
     scoped_refptr< ::ppapi::TrackedCallback> callback,
     PPB_FileRef_Impl* dir_ref,
     linked_ptr<std::vector< ::ppapi::PPB_FileRef_CreateInfo> > dir_files,
     linked_ptr<std::vector<PP_FileType> > dir_file_types,
-    const std::vector<base::FileUtilProxy::Entry>& entries,
+    const std::vector<fileapi::DirectoryEntry>& entries,
     bool has_more) {
   if (!TrackedCallback::IsPending(callback))
     return;
 
   // The current filesystem backend always returns false.
   DCHECK(!has_more);
 
   DCHECK(dir_ref);
   DCHECK(dir_files.get());
   DCHECK(dir_file_types.get());
 
   std::string dir_path = dir_ref->GetCreateInfo().path;
   if (dir_path.empty() || dir_path[dir_path.size() - 1] != '/')
     dir_path += '/';
 
   for (size_t i = 0; i < entries.size(); ++i) {
-    const base::FileUtilProxy::Entry& entry = entries[i];
+    const fileapi::DirectoryEntry& entry = entries[i];
     scoped_refptr<PPB_FileRef_Impl> file_ref(PPB_FileRef_Impl::CreateInternal(
         dir_ref->pp_instance(),
         dir_ref->file_system_resource(),
         dir_path + fileapi::FilePathToString(base::FilePath(entry.name))));
     dir_files->push_back(file_ref->GetCreateInfo());
     dir_file_types->push_back(
         entry.is_directory ? PP_FILETYPE_DIRECTORY : PP_FILETYPE_REGULAR);
     // Add a ref count on behalf of the plugin side.
     file_ref->GetReference();
   }
@@ skipping 309 matching lines @@
           GetFileSystemURL(),
           base::Bind(&DidReadDirectory,
                      callback, base::Unretained(this), files, file_types),
           base::Bind(&DidFinishFileOperation, callback)))
     return PP_ERROR_FAILED;
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace ppapi
 }  // namespace webkit