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

webkit/tools/test_shell/simple_file_system.h

 // 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 #define WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_
 
 #include <vector>
 #include "base/files/file_util_proxy.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 70 matching lines @@
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void directoryExists(
       const WebKit::WebURL& path,
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void readDirectory(
       const WebKit::WebURL& path,
       WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual WebKit::WebFileWriter* createFileWriter(
       const WebKit::WebURL& path, WebKit::WebFileWriterClient*) OVERRIDE;
   virtual void createSnapshotFileAndReadMetadata(
+      const WebKit::WebURL& path,
+      WebKit::WebFileSystemCallbacks* callbacks);
+
+  // DEPRECATED
+  virtual void createSnapshotFileAndReadMetadata(
       const WebKit::WebURL& blobURL,
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks* callbacks) OVERRIDE;
+      WebKit::WebFileSystemCallbacks* callbacks);
 
   static void InitializeOnIOThread(
       webkit_blob::BlobStorageController* blob_storage_controller);
   static void CleanupOnIOThread();
 
  private:
   enum FilePermission {
     FILE_PERMISSION_READ,
     FILE_PERMISSION_WRITE,
     FILE_PERMISSION_CREATE,
@@ skipping 10 matching lines @@
       WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemOperation::GetMetadataCallback GetMetadataHandler(
       WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemOperation::ReadDirectoryCallback
       ReadDirectoryHandler(WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemContext::OpenFileSystemCallback OpenFileSystemHandler(
       WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemContext::DeleteFileSystemCallback DeleteFileSystemHandler(
       WebKit::WebFileSystemCallbacks* callbacks);
   fileapi::FileSystemOperation::SnapshotFileCallback
-      SnapshotFileHandler(const GURL& blob_url,
-                          WebKit::WebFileSystemCallbacks* callbacks);
+      SnapshotFileHandler(WebKit::WebFileSystemCallbacks* callbacks);
+  fileapi::FileSystemOperation::SnapshotFileCallback
+      SnapshotFileHandler_Deprecated(
+          const GURL& blob_url,
+          WebKit::WebFileSystemCallbacks* callbacks);
   void DidFinish(WebKit::WebFileSystemCallbacks* callbacks,
                  base::PlatformFileError result);
   void DidGetMetadata(WebKit::WebFileSystemCallbacks* callbacks,
                       base::PlatformFileError result,
                       const base::PlatformFileInfo& info,
                       const FilePath& platform_path);
   void DidReadDirectory(
       WebKit::WebFileSystemCallbacks* callbacks,
       base::PlatformFileError result,
       const std::vector<base::FileUtilProxy::Entry>& entries,
       bool has_more);
   void DidOpenFileSystem(WebKit::WebFileSystemCallbacks* callbacks,
                          base::PlatformFileError result,
                          const std::string& name, const GURL& root);
   void DidDeleteFileSystem(WebKit::WebFileSystemCallbacks* callbacks,
                            base::PlatformFileError result);
   void DidCreateSnapshotFile(
+      WebKit::WebFileSystemCallbacks* callbacks,
+      base::PlatformFileError result,
+      const base::PlatformFileInfo& info,
+      const FilePath& platform_path,
+      const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
+  void DidCreateSnapshotFile_Deprecated(
       const GURL& blob_url,
       WebKit::WebFileSystemCallbacks* callbacks,
       base::PlatformFileError result,
       const base::PlatformFileInfo& info,
       const FilePath& platform_path,
       const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);
 
   // A temporary directory for FileSystem API.
   base::ScopedTempDir file_system_dir_;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFileSystem);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_SIMPLE_FILE_SYSTEM_H_