Web expose FileSystemFileEntry, FileSystemDirectoryEntry and friends

third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReaderSync.cpp

Index: third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReaderSync.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReaderSync.cpp
similarity index 67%
rename from third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp
rename to third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReaderSync.cpp
index cfd597571be3c40527ace99821584fb60448bc59..26a03ac90452ac9165e87ca7cf58a7aaf96d7d1e 100644
--- a/third_party/WebKit/Source/modules/filesystem/DirectoryReaderSync.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/FileSystemDirectoryReaderSync.cpp
@@ -28,46 +28,48 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "modules/filesystem/DirectoryReaderSync.h"
+#include "modules/filesystem/FileSystemDirectoryReaderSync.h"
 
 #include "bindings/core/v8/ExceptionState.h"
-#include "modules/filesystem/DirectoryEntry.h"
-#include "modules/filesystem/DirectoryEntrySync.h"
-#include "modules/filesystem/EntriesCallback.h"
-#include "modules/filesystem/EntrySync.h"
 #include "modules/filesystem/ErrorCallback.h"
-#include "modules/filesystem/FileEntrySync.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
+#include "modules/filesystem/FileSystemDirectoryEntry.h"
+#include "modules/filesystem/FileSystemDirectoryEntrySync.h"
+#include "modules/filesystem/FileSystemEntriesCallback.h"
+#include "modules/filesystem/FileSystemEntrySync.h"
+#include "modules/filesystem/FileSystemFileEntrySync.h"
 
 namespace blink {
 
-class DirectoryReaderSync::EntriesCallbackHelper final
-    : public EntriesCallback {
+class FileSystemDirectoryReaderSync::EntriesCallbackHelper final
+    : public FileSystemEntriesCallback {
  public:
-  explicit EntriesCallbackHelper(DirectoryReaderSync* reader)
+  explicit EntriesCallbackHelper(FileSystemDirectoryReaderSync* reader)
       : m_reader(reader) {}
 
   void handleEvent(const EntryHeapVector& entries) override {
     EntrySyncHeapVector syncEntries;
     syncEntries.reserveInitialCapacity(entries.size());
-    for (size_t i = 0; i < entries.size(); ++i)
-      syncEntries.uncheckedAppend(EntrySync::create(entries[i].get()));
+    for (size_t i = 0; i < entries.size(); ++i) {
+      syncEntries.uncheckedAppend(
+          FileSystemEntrySync::create(entries[i].get()));
+    }
     m_reader->addEntries(syncEntries);
   }
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_reader);
-    EntriesCallback::trace(visitor);
+    FileSystemEntriesCallback::trace(visitor);
   }
 
  private:
-  Member<DirectoryReaderSync> m_reader;
+  Member<FileSystemDirectoryReaderSync> m_reader;
 };
 
-class DirectoryReaderSync::ErrorCallbackHelper final
+class FileSystemDirectoryReaderSync::ErrorCallbackHelper final
     : public ErrorCallbackBase {
  public:
-  explicit ErrorCallbackHelper(DirectoryReaderSync* reader)
+  explicit ErrorCallbackHelper(FileSystemDirectoryReaderSync* reader)
       : m_reader(reader) {}
 
   void invoke(FileError::ErrorCode error) override {
@@ -80,23 +82,24 @@ class DirectoryReaderSync::ErrorCallbackHelper final
   }
 
  private:
-  Member<DirectoryReaderSync> m_reader;
+  Member<FileSystemDirectoryReaderSync> m_reader;
 };
 
-DirectoryReaderSync::DirectoryReaderSync(DOMFileSystemBase* fileSystem,
-                                         const String& fullPath)
-    : DirectoryReaderBase(fileSystem, fullPath),
+FileSystemDirectoryReaderSync::FileSystemDirectoryReaderSync(
+    FileSystemBase* fileSystem,
+    const String& fullPath)
+    : FileSystemDirectoryReaderBase(fileSystem, fullPath),
       m_callbacksId(0),
       m_errorCode(FileError::kOK) {}
 
-DirectoryReaderSync::~DirectoryReaderSync() {}
+FileSystemDirectoryReaderSync::~FileSystemDirectoryReaderSync() {}
 
-EntrySyncHeapVector DirectoryReaderSync::readEntries(
+EntrySyncHeapVector FileSystemDirectoryReaderSync::readEntries(
     ExceptionState& exceptionState) {
   if (!m_callbacksId) {
     m_callbacksId = filesystem()->readDirectory(
         this, m_fullPath, new EntriesCallbackHelper(this),
-        new ErrorCallbackHelper(this), DOMFileSystemBase::Synchronous);
+        new ErrorCallbackHelper(this), FileSystemBase::Synchronous);
   }
 
   if (m_errorCode == FileError::kOK && m_hasMoreEntries && m_entries.isEmpty())
@@ -112,9 +115,9 @@ EntrySyncHeapVector DirectoryReaderSync::readEntries(
   return result;
 }
 
-DEFINE_TRACE(DirectoryReaderSync) {
+DEFINE_TRACE(FileSystemDirectoryReaderSync) {
   visitor->trace(m_entries);
-  DirectoryReaderBase::trace(visitor);
+  FileSystemDirectoryReaderBase::trace(visitor);
 }
 
 }  // namespace blink