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 /content/public | |
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 'content/public')
-rw-r--r-- | content/public/browser/content_browser_client.h | 5 | ||||
-rw-r--r-- | content/public/test/test_file_system_backend.cc | 1 | ||||
-rw-r--r-- | content/public/test/test_file_system_context.cc | 20 | ||||
-rw-r--r-- | content/public/test/test_file_system_context.h | 9 |
4 files changed, 2 insertions, 33 deletions
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index 01c2eb9..a0396ff 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -24,7 +24,6 @@ #include "net/url_request/url_request_job_factory.h" #include "third_party/WebKit/public/web/WebNotificationPresenter.h" #include "ui/base/window_open_disposition.h" -#include "webkit/browser/fileapi/file_system_context.h" #include "webkit/common/resource_type.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -584,10 +583,6 @@ class CONTENT_EXPORT ContentBrowserClient { virtual void GetAdditionalAllowedSchemesForFileSystem( std::vector<std::string>* additional_schemes) {} - // Returns auto mount handlers for URL requests for FileSystem APIs. - virtual void GetURLRequestAutoMountHandlers( - std::vector<fileapi::URLRequestAutoMountHandler>* handlers) {} - // Returns additional file system backends for FileSystem API. // |browser_context| is needed in the additional FileSystemBackends. // It has mount points to create objects returned by additional diff --git a/content/public/test/test_file_system_backend.cc b/content/public/test/test_file_system_backend.cc index 8c37a9e..b473716 100644 --- a/content/public/test/test_file_system_backend.cc +++ b/content/public/test/test_file_system_backend.cc @@ -137,6 +137,7 @@ class TestFileSystemBackend::QuotaUtil virtual const fileapi::AccessObserverList* GetAccessObservers( FileSystemType type) const OVERRIDE { + NOTIMPLEMENTED(); return NULL; } diff --git a/content/public/test/test_file_system_context.cc b/content/public/test/test_file_system_context.cc index aa954de..d09bbd1 100644 --- a/content/public/test/test_file_system_context.cc +++ b/content/public/test/test_file_system_context.cc @@ -36,25 +36,6 @@ CreateFileSystemContextWithAdditionalProvidersForTesting( make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(), quota_manager_proxy, additional_providers.Pass(), - std::vector<fileapi::URLRequestAutoMountHandler>(), - base_path, - CreateAllowFileAccessOptions()); -} - -fileapi::FileSystemContext* -CreateFileSystemContextWithAutoMountersForTesting( - quota::QuotaManagerProxy* quota_manager_proxy, - ScopedVector<fileapi::FileSystemBackend> additional_providers, - const std::vector<fileapi::URLRequestAutoMountHandler>& auto_mounters, - const base::FilePath& base_path) { - return new fileapi::FileSystemContext( - base::MessageLoopProxy::current().get(), - base::MessageLoopProxy::current().get(), - fileapi::ExternalMountPoints::CreateRefCounted().get(), - make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(), - quota_manager_proxy, - additional_providers.Pass(), - auto_mounters, base_path, CreateAllowFileAccessOptions()); } @@ -70,7 +51,6 @@ fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting( make_scoped_refptr(new quota::MockSpecialStoragePolicy()).get(), quota_manager_proxy, additional_providers.Pass(), - std::vector<fileapi::URLRequestAutoMountHandler>(), base_path, CreateIncognitoFileSystemOptions()); } diff --git a/content/public/test/test_file_system_context.h b/content/public/test/test_file_system_context.h index 8b7c872..19a4fc4 100644 --- a/content/public/test/test_file_system_context.h +++ b/content/public/test/test_file_system_context.h @@ -7,7 +7,6 @@ #include "base/files/file_path.h" #include "base/memory/scoped_vector.h" -#include "webkit/browser/fileapi/file_system_context.h" namespace quota { class QuotaManagerProxy; @@ -15,6 +14,7 @@ class SpecialStoragePolicy; } namespace fileapi { +class FileSystemContext; class FileSystemBackend; } @@ -32,13 +32,6 @@ CreateFileSystemContextWithAdditionalProvidersForTesting( ScopedVector<fileapi::FileSystemBackend> additional_providers, const base::FilePath& base_path); -fileapi::FileSystemContext* -CreateFileSystemContextWithAutoMountersForTesting( - quota::QuotaManagerProxy* quota_manager_proxy, - ScopedVector<fileapi::FileSystemBackend> additional_providers, - const std::vector<fileapi::URLRequestAutoMountHandler>& auto_mounters, - const base::FilePath& base_path); - fileapi::FileSystemContext* CreateIncognitoFileSystemContextForTesting( quota::QuotaManagerProxy* quota_manager_proxy, const base::FilePath& base_path); |