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

webkit/plugins/ppapi/file_callbacks.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/file_callbacks.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_errors.h"
@@ skipping 73 matching lines @@
   callback_->Run(PP_OK);
 }
 
 void FileCallbacks::DidCreateSnapshotFile(
     const base::PlatformFileInfo& file_info,
     const base::FilePath& path) {
   NOTREACHED();
 }
 
 void FileCallbacks::DidReadDirectory(
-    const std::vector<base::FileUtilProxy::Entry>& entries, bool has_more) {
+    const std::vector<fileapi::FileSystemOperation::Entry>& entries,
+    bool has_more) {
   if (callback_->completed())
     return;
 
   // The current filesystem backend always returns false.
   DCHECK(!has_more);
 
   DCHECK(read_entries_dir_ref_);
   DCHECK(read_entries_files_.get());
   DCHECK(read_entries_file_types_.get());
 
   std::string dir_path = read_entries_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::FileSystemOperation::Entry& entry = entries[i];
     scoped_refptr<PPB_FileRef_Impl> file_ref(PPB_FileRef_Impl::CreateInternal(
         read_entries_dir_ref_->pp_instance(),
         read_entries_dir_ref_->file_system_resource(),
         dir_path + fileapi::FilePathToString(base::FilePath(entry.name))));
     read_entries_files_->push_back(file_ref->GetCreateInfo());
     read_entries_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 17 matching lines @@
 
 void FileCallbacks::RunCallback(base::PlatformFileError error_code) {
   if (callback_->completed())
     return;
 
   callback_->Run(::ppapi::PlatformFileErrorToPepperError(error_code));
 }
 
 }  // namespace ppapi
 }  // namespace webkit