Web expose FileSystemFileEntry, FileSystemDirectoryEntry and friends

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

Index: third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
index 572c1f35ec6688d961e511549ecce1f8c30e5e8d..452aa162701b803a2a70516aec6704da38440721 100644
--- a/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/DOMWindowFileSystem.cpp
@@ -29,11 +29,11 @@
 #include "core/fileapi/FileError.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/UseCounter.h"
-#include "modules/filesystem/DOMFileSystem.h"
-#include "modules/filesystem/EntryCallback.h"
 #include "modules/filesystem/ErrorCallback.h"
+#include "modules/filesystem/FileSystem.h"
 #include "modules/filesystem/FileSystemCallback.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
+#include "modules/filesystem/FileSystemEntryCallback.h"
 #include "modules/filesystem/LocalFileSystem.h"
 #include "platform/FileSystemType.h"
 #include "platform/weborigin/SchemeRegistry.h"
@@ -60,17 +60,15 @@ void DOMWindowFileSystem::webkitRequestFileSystem(
     UseCounter::count(document, UseCounter::RequestFileSystemNonWebbyOrigin);
 
   if (!document->getSecurityOrigin()->canAccessFileSystem()) {
-    DOMFileSystem::reportError(document,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kSecurityErr);
+    FileSystem::reportError(document, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kSecurityErr);
     return;
   }
 
   FileSystemType fileSystemType = static_cast<FileSystemType>(type);
-  if (!DOMFileSystemBase::isValidType(fileSystemType)) {
-    DOMFileSystem::reportError(document,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kInvalidModificationErr);
+  if (!FileSystemBase::isValidType(fileSystemType)) {
+    FileSystem::reportError(document, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kInvalidModificationErr);
     return;
   }
 
@@ -84,7 +82,7 @@ void DOMWindowFileSystem::webkitRequestFileSystem(
 void DOMWindowFileSystem::webkitResolveLocalFileSystemURL(
     DOMWindow& windowArg,
     const String& url,
-    EntryCallback* successCallback,
+    FileSystemEntryCallback* successCallback,
     ErrorCallback* errorCallback) {
   LocalDOMWindow& window = toLocalDOMWindow(windowArg);
   if (!window.isCurrentlyDisplayedInFrame())
@@ -98,16 +96,14 @@ void DOMWindowFileSystem::webkitResolveLocalFileSystemURL(
   KURL completedURL = document->completeURL(url);
   if (!securityOrigin->canAccessFileSystem() ||
       !securityOrigin->canRequest(completedURL)) {
-    DOMFileSystem::reportError(document,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kSecurityErr);
+    FileSystem::reportError(document, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kSecurityErr);
     return;
   }
 
   if (!completedURL.isValid()) {
-    DOMFileSystem::reportError(document,
-                               ScriptErrorCallback::wrap(errorCallback),
-                               FileError::kEncodingErr);
+    FileSystem::reportError(document, ScriptErrorCallback::wrap(errorCallback),
+                            FileError::kEncodingErr);
     return;
   }