FileSystem mods: Changes to snapshot file creation to remove dependencies on blobs.

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/file_path.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 221 matching lines @@
   }
   GetNewOperation(url)->ReadDirectory(url, ReadDirectoryHandler(callbacks));
 }
 
 WebFileWriter* SimpleFileSystem::createFileWriter(
     const WebURL& path, WebFileWriterClient* client) {
   return new SimpleFileWriter(path, client, file_system_context_.get());
 }
 
 void SimpleFileSystem::createSnapshotFileAndReadMetadata(
+    const WebURL& path,
+    WebFileSystemCallbacks* callbacks) {
+  FileSystemURL url(file_system_context()->CrackURL(path));
+  if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
+    callbacks->didFail(WebKit::WebFileErrorSecurity);
+    return;
+  }
+  GetNewOperation(url)->CreateSnapshotFile(
+      url, SnapshotFileHandler(callbacks));
+}
+
+// DEPRECATED
+void SimpleFileSystem::createSnapshotFileAndReadMetadata(
     const WebURL& blobURL,
     const WebURL& path,
     WebFileSystemCallbacks* callbacks) {
   FileSystemURL url(file_system_context()->CrackURL(path));
   if (!HasFilePermission(url, FILE_PERMISSION_READ)) {
     callbacks->didFail(WebKit::WebFileErrorSecurity);
     return;
   }
   GetNewOperation(url)->CreateSnapshotFile(
-      url, SnapshotFileHandler(blobURL, callbacks));
+      url, SnapshotFileHandler_Deprecated(blobURL, callbacks));
 }
 
 // static
 void SimpleFileSystem::InitializeOnIOThread(
     webkit_blob::BlobStorageController* blob_storage_controller) {
   g_io_thread = MessageLoop::current();
   g_blob_storage_controller = blob_storage_controller;
 }
 
 // static
@@ skipping 38 matching lines @@
                     AsWeakPtr(), base::Unretained(callbacks));
 }
 
 FileSystemContext::DeleteFileSystemCallback
 SimpleFileSystem::DeleteFileSystemHandler(WebFileSystemCallbacks* callbacks) {
   return base::Bind(&SimpleFileSystem::DidDeleteFileSystem,
                     AsWeakPtr(), callbacks);
 }
 
 FileSystemOperation::SnapshotFileCallback
-SimpleFileSystem::SnapshotFileHandler(const GURL& blob_url,
-                                      WebFileSystemCallbacks* callbacks) {
+SimpleFileSystem::SnapshotFileHandler(
+    WebFileSystemCallbacks* callbacks) {
   return base::Bind(&SimpleFileSystem::DidCreateSnapshotFile,
+                    AsWeakPtr(), base::Unretained(callbacks));
+}
+
+FileSystemOperation::SnapshotFileCallback
+SimpleFileSystem::SnapshotFileHandler_Deprecated(
+    const GURL& blob_url,
+    WebFileSystemCallbacks* callbacks) {
+  return base::Bind(&SimpleFileSystem::DidCreateSnapshotFile_Deprecated,
                     AsWeakPtr(), blob_url, base::Unretained(callbacks));
 }
 
 void SimpleFileSystem::DidFinish(WebFileSystemCallbacks* callbacks,
                                  base::PlatformFileError result) {
   if (result == base::PLATFORM_FILE_OK)
     callbacks->didSucceed();
   else
     callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
 }
@@ skipping 54 matching lines @@
 void SimpleFileSystem::DidDeleteFileSystem(
     WebFileSystemCallbacks* callbacks,
     base::PlatformFileError result) {
   if (result == base::PLATFORM_FILE_OK)
     callbacks->didSucceed();
   else
     callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
 }
 
 void SimpleFileSystem::DidCreateSnapshotFile(
+    WebFileSystemCallbacks* callbacks,
+    base::PlatformFileError result,
+    const base::PlatformFileInfo& info,
+    const FilePath& platform_path,
+    const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) {
+  if (result == base::PLATFORM_FILE_OK) {
+    WebFileInfo web_file_info;
+    web_file_info.length = info.size;
+    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);

[michaeln, 2013/01/30 23:32:24]

ditto

+  } else {
+    callbacks->didFail(fileapi::PlatformFileErrorToWebFileError(result));
+  }
+}
+
+void SimpleFileSystem::DidCreateSnapshotFile_Deprecated(
     const GURL& blob_url,
     WebFileSystemCallbacks* callbacks,
     base::PlatformFileError result,
     const base::PlatformFileInfo& info,
     const FilePath& platform_path,
     const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref) {
   DCHECK(g_io_thread);
   if (result == base::PLATFORM_FILE_OK) {
     g_io_thread->PostTask(
         FROM_HERE,
         base::Bind(&RegisterBlob, blob_url, platform_path));
   }
   DidGetMetadata(callbacks, result, info, platform_path);
 }