diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 10:01:20 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 10:01:20 +0000 |
| commit | 1e2da17f0ad005628ac166e9fdab757d29576e32 (patch) | |
| tree | db1c61ec5d16e5f4c308569603ced3549dcc0ff4 /webkit/browser/fileapi/file_system_context.h | |
| parent | 72600dd9457b4c4bda484cd4679c3d399f348e10 (diff) | |
| download | chromium_src-1e2da17f0ad005628ac166e9fdab757d29576e32.zip chromium_src-1e2da17f0ad005628ac166e9fdab757d29576e32.tar.gz chromium_src-1e2da17f0ad005628ac166e9fdab757d29576e32.tar.bz2 | |
Revert of Add mechanism to auto mount file systems in response to a URL request. (https://codereview.chromium.org/195923002/)
Reason for revert:
Best guess that this broke
SyncFileSystemApiTest.WriteFileThenGetUsage
SyncFileSystemApiTest.GetFileStatuses
MediaGalleriesPlatformAppBrowserTest.MediaGalleriesCopyTo
on XP Tests(1).
Original issue's description:
> Add mechanism to auto mount file systems in response to a URL request.
>
> This code adds a hook for when a file system URL request can not be cracked.
> It will allow external media galleries file systems to be lazily created.
>
> BUG=160900
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258064
TBR=kinuko@chromium.org,tzik@chromium.org,joi@chromium.org,sky@chromium.org,vandebo@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=160900
Review URL: https://codereview.chromium.org/206253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/fileapi/file_system_context.h')
| -rw-r--r-- | webkit/browser/fileapi/file_system_context.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/webkit/browser/fileapi/file_system_context.h b/webkit/browser/fileapi/file_system_context.h index ba91af7..62841d1 100644 --- a/webkit/browser/fileapi/file_system_context.h +++ b/webkit/browser/fileapi/file_system_context.h @@ -38,10 +38,6 @@ class QuotaManagerProxy; class SpecialStoragePolicy; } -namespace net { -class URLRequest; -} - namespace webkit_blob { class BlobURLRequestJobTest; class FileStreamReader; @@ -69,18 +65,6 @@ class SandboxFileSystemBackend; struct DefaultContextDeleter; struct FileSystemInfo; -// An auto mount handler will attempt to mount the file system requested in -// |url_request|. If the URL is for this auto mount handler, it returns true -// and calls |callback| when the attempt is complete. If the auto mounter -// does not recognize the URL, it returns false and does not call |callback|. -// Called on the IO thread. -typedef base::Callback<bool( - const net::URLRequest* url_request, - const FileSystemURL& filesystem_url, - const std::string& storage_domain, - const base::Callback<void(base::File::Error result)>& callback)> - URLRequestAutoMountHandler; - // This class keeps and provides a file system context for FileSystem API. // An instance of this class is created and owned by profile. class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext @@ -111,10 +95,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext // to serve filesystem requests for non-regular types. // If none is given, this context only handles HTML5 Sandbox FileSystem // and Drag-and-drop Isolated FileSystem requests. - // - // |auto_mount_handlers| are used to resolve calls to - // AttemptAutoMountForURLRequest. Only external filesystems are auto mounted - // when a filesystem: URL request is made. FileSystemContext( base::SingleThreadTaskRunner* io_task_runner, base::SequencedTaskRunner* file_task_runner, @@ -122,7 +102,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext quota::SpecialStoragePolicy* special_storage_policy, quota::QuotaManagerProxy* quota_manager_proxy, ScopedVector<FileSystemBackend> additional_backends, - const std::vector<URLRequestAutoMountHandler>& auto_mount_handlers, const base::FilePath& partition_path, const FileSystemOptions& options); @@ -214,13 +193,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext const FileSystemURL& url, const ResolveURLCallback& callback); - // Attempts to mount the filesystem needed to satisfy |url_request| made - // from |storage_domain|. If an appropriate file system is not found, - // callback will return an error. - void AttemptAutoMountForURLRequest(const net::URLRequest* url_request, - const std::string& storage_domain, - const StatusCallback& callback); - // Deletes the filesystem for the given |origin_url| and |type|. This should // be called on the IO thread. void DeleteFileSystem( @@ -371,8 +343,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemContext scoped_ptr<PluginPrivateFileSystemBackend> plugin_private_backend_; ScopedVector<FileSystemBackend> additional_backends_; - std::vector<URLRequestAutoMountHandler> auto_mount_handlers_; - // Registered file system backends. // The map must be constructed in the constructor since it can be accessed // on multiple threads. |