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

webkit/tools/test_shell/simple_file_system.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/tools/test_shell/simple_file_system.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemEntry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "webkit/base/file_path_string_conversions.h"
 #include "webkit/blob/blob_storage_controller.h"
+#include "webkit/fileapi/directory_entry.h"
 #include "webkit/fileapi/file_permission_policy.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/mock_file_system_context.h"
 #include "webkit/tools/test_shell/simple_file_writer.h"
 
 using base::WeakPtr;
 
 using WebKit::WebFileInfo;
 using WebKit::WebFileSystem;
 using WebKit::WebFileSystemCallbacks;
 using WebKit::WebFileSystemEntry;
 using WebKit::WebFileWriter;
 using WebKit::WebFileWriterClient;
 using WebKit::WebFrame;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebVector;
 
 using webkit_blob::BlobData;
 using webkit_blob::BlobStorageController;
+using fileapi::DirectoryEntry;
 using fileapi::FileSystemContext;
 using fileapi::FileSystemOperation;
 using fileapi::FileSystemTaskRunners;
 using fileapi::FileSystemURL;
 
 namespace {
 MessageLoop* g_io_thread;
 webkit_blob::BlobStorageController* g_blob_storage_controller;
 
 void RegisterBlob(const GURL& blob_url, const base::FilePath& file_path) {
@@ skipping 280 matching lines @@
         webkit_base::FilePathToWebString(platform_path);
     callbacks->didReadMetadata(web_file_info);
   } else {
     callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
   }
 }
 
 void SimpleFileSystem::DidReadDirectory(
     WebFileSystemCallbacks* callbacks,
     base::PlatformFileError result,
-    const std::vector<base::FileUtilProxy::Entry>& entries,
+    const std::vector<DirectoryEntry>& entries,
     bool has_more) {
   if (result == base::PLATFORM_FILE_OK) {
     std::vector<WebFileSystemEntry> web_entries_vector;
-    for (std::vector<base::FileUtilProxy::Entry>::const_iterator it =
-            entries.begin(); it != entries.end(); ++it) {
+    for (std::vector<DirectoryEntry>::const_iterator it = entries.begin();
+         it != entries.end(); ++it) {
       WebFileSystemEntry entry;
       entry.name = webkit_base::FilePathStringToWebString(it->name);
       entry.isDirectory = it->is_directory;
       web_entries_vector.push_back(entry);
     }
     WebVector<WebKit::WebFileSystemEntry> web_entries = web_entries_vector;
     callbacks->didReadDirectory(web_entries, has_more);
   } else {
     callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
   }
@@ skipping 34 matching lines @@
     web_file_info.modificationTime = info.last_modified.ToDoubleT();
     web_file_info.type = info.is_directory ?
         WebFileInfo::TypeDirectory : WebFileInfo::TypeFile;
     web_file_info.platformPath =
         webkit_base::FilePathToWebString(platform_path);
     callbacks->didCreateSnapshotFile(web_file_info);
   } else {
     callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
   }
 }