Skip to content

GitLab

T
tangled
Commit 96f03c48 authored by thestig@chromium.org's avatar thestig@chromium.org
Browse files
Options

Cleanup: Remove... 

Cleanup: Remove fileapi::FileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory() and make it a method only in TestMountPointProvider.

Review URL: https://chromiumcodereview.appspot.com/15729007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202827 0039d316-1c4b-4281-b951-d872f2087c98
parent c263e20f
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 61 deletions
chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
View file @ 96f03c48
...@@ -130,21 +130,6 @@ MediaFileSystemMountPointProvider::GetCopyOrMoveFileValidatorFactory( ...@@ -130,21 +130,6 @@ MediaFileSystemMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL; return NULL;
} }
void
MediaFileSystemMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type,
scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
switch (type) {
case fileapi::kFileSystemTypeNativeMedia:
case fileapi::kFileSystemTypeDeviceMedia:
if (!media_copy_or_move_file_validator_factory_)
media_copy_or_move_file_validator_factory_.reset(factory.release());
break;
default:
NOTREACHED();
}
}
fileapi::FilePermissionPolicy fileapi::FilePermissionPolicy
MediaFileSystemMountPointProvider::GetPermissionPolicy( MediaFileSystemMountPointProvider::GetPermissionPolicy(
const FileSystemURL& url, int permissions) const { const FileSystemURL& url, int permissions) const {
......
chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h
View file @ 96f03c48
...@@ -43,9 +43,6 @@ class MediaFileSystemMountPointProvider ...@@ -43,9 +43,6 @@ class MediaFileSystemMountPointProvider
GetCopyOrMoveFileValidatorFactory( GetCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type, fileapi::FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE; base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type,
scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual fileapi::FilePermissionPolicy GetPermissionPolicy( virtual fileapi::FilePermissionPolicy GetPermissionPolicy(
const fileapi::FileSystemURL& url, int permissions) const OVERRIDE; const fileapi::FileSystemURL& url, int permissions) const OVERRIDE;
virtual fileapi::FileSystemOperation* CreateFileSystemOperation( virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
......
webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc
View file @ 96f03c48
...@@ -219,12 +219,6 @@ CrosMountPointProvider::GetCopyOrMoveFileValidatorFactory( ...@@ -219,12 +219,6 @@ CrosMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL; return NULL;
} }
void CrosMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type,
scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
DCHECK(!factory);
}
fileapi::FilePermissionPolicy CrosMountPointProvider::GetPermissionPolicy( fileapi::FilePermissionPolicy CrosMountPointProvider::GetPermissionPolicy(
const fileapi::FileSystemURL& url, int permissions) const { const fileapi::FileSystemURL& url, int permissions) const {
if (url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal && if (url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal &&
......
webkit/browser/chromeos/fileapi/cros_mount_point_provider.h
View file @ 96f03c48
...@@ -67,9 +67,6 @@ class WEBKIT_STORAGE_EXPORT CrosMountPointProvider ...@@ -67,9 +67,6 @@ class WEBKIT_STORAGE_EXPORT CrosMountPointProvider
GetCopyOrMoveFileValidatorFactory( GetCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type, fileapi::FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE; base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type,
scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual fileapi::FilePermissionPolicy GetPermissionPolicy( virtual fileapi::FilePermissionPolicy GetPermissionPolicy(
const fileapi::FileSystemURL& url, const fileapi::FileSystemURL& url,
int permissions) const OVERRIDE; int permissions) const OVERRIDE;
......
webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
View file @ 96f03c48
...@@ -88,10 +88,9 @@ class CopyOrMoveFileValidatorTestHelper { ...@@ -88,10 +88,9 @@ class CopyOrMoveFileValidatorTestHelper {
void SetMediaCopyOrMoveFileValidatorFactory( void SetMediaCopyOrMoveFileValidatorFactory(
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) { scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
FileSystemMountPointProvider* mount_point_provider = TestMountPointProvider* provider = static_cast<TestMountPointProvider*>(
file_system_context_->GetMountPointProvider(kWithValidatorType); file_system_context_->GetMountPointProvider(kWithValidatorType));
mount_point_provider->InitializeCopyOrMoveFileValidatorFactory( provider->InitializeCopyOrMoveFileValidatorFactory(factory.Pass());
kWithValidatorType, factory.Pass());
} }
void CopyTest(base::PlatformFileError expected) { void CopyTest(base::PlatformFileError expected) {
...@@ -180,7 +179,8 @@ class TestCopyOrMoveFileValidatorFactory ...@@ -180,7 +179,8 @@ class TestCopyOrMoveFileValidatorFactory
: public CopyOrMoveFileValidatorFactory { : public CopyOrMoveFileValidatorFactory {
public: public:
// A factory that creates validators that accept everything or nothing. // A factory that creates validators that accept everything or nothing.
TestCopyOrMoveFileValidatorFactory(bool all_valid) : all_valid_(all_valid) {} explicit TestCopyOrMoveFileValidatorFactory(bool all_valid)
: all_valid_(all_valid) {}
virtual ~TestCopyOrMoveFileValidatorFactory() {} virtual ~TestCopyOrMoveFileValidatorFactory() {}
virtual CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator( virtual CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
...@@ -192,7 +192,7 @@ class TestCopyOrMoveFileValidatorFactory ...@@ -192,7 +192,7 @@ class TestCopyOrMoveFileValidatorFactory
private: private:
class TestCopyOrMoveFileValidator : public CopyOrMoveFileValidator { class TestCopyOrMoveFileValidator : public CopyOrMoveFileValidator {
public: public:
TestCopyOrMoveFileValidator(bool all_valid) explicit TestCopyOrMoveFileValidator(bool all_valid)
: result_(all_valid ? base::PLATFORM_FILE_OK : result_(all_valid ? base::PLATFORM_FILE_OK
: base::PLATFORM_FILE_ERROR_SECURITY) { : base::PLATFORM_FILE_ERROR_SECURITY) {
} }
......
webkit/browser/fileapi/file_system_mount_point_provider.h
View file @ 96f03c48
...@@ -78,12 +78,6 @@ class WEBKIT_STORAGE_EXPORT FileSystemMountPointProvider { ...@@ -78,12 +78,6 @@ class WEBKIT_STORAGE_EXPORT FileSystemMountPointProvider {
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type, base::PlatformFileError* error_code) = 0; FileSystemType type, base::PlatformFileError* error_code) = 0;
// Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
// once.
virtual void InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) = 0;
// Returns file permission policy we should apply for the given |url|. // Returns file permission policy we should apply for the given |url|.
virtual FilePermissionPolicy GetPermissionPolicy( virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url, const FileSystemURL& url,
......
webkit/browser/fileapi/isolated_mount_point_provider.cc
View file @ 96f03c48
...@@ -105,12 +105,6 @@ IsolatedMountPointProvider::GetCopyOrMoveFileValidatorFactory( ...@@ -105,12 +105,6 @@ IsolatedMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL; return NULL;
} }
void IsolatedMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
DCHECK(!factory);
}
FilePermissionPolicy IsolatedMountPointProvider::GetPermissionPolicy( FilePermissionPolicy IsolatedMountPointProvider::GetPermissionPolicy(
const FileSystemURL& url, int permissions) const { const FileSystemURL& url, int permissions) const {
if (url.type() == kFileSystemTypeDragged && url.path().empty()) { if (url.type() == kFileSystemTypeDragged && url.path().empty()) {
......
webkit/browser/fileapi/isolated_mount_point_provider.h
View file @ 96f03c48
...@@ -29,9 +29,6 @@ class IsolatedMountPointProvider : public FileSystemMountPointProvider { ...@@ -29,9 +29,6 @@ class IsolatedMountPointProvider : public FileSystemMountPointProvider {
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type, FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE; base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy( virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url, const FileSystemURL& url,
int permissions) const OVERRIDE; int permissions) const OVERRIDE;
......
webkit/browser/fileapi/sandbox_mount_point_provider.cc
View file @ 96f03c48
...@@ -264,12 +264,6 @@ SandboxMountPointProvider::GetCopyOrMoveFileValidatorFactory( ...@@ -264,12 +264,6 @@ SandboxMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL; return NULL;
} }
void SandboxMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
DCHECK(!factory);
}
FilePermissionPolicy SandboxMountPointProvider::GetPermissionPolicy( FilePermissionPolicy SandboxMountPointProvider::GetPermissionPolicy(
const FileSystemURL& url, int permissions) const { const FileSystemURL& url, int permissions) const {
if (!CanHandleType(url.type()) || !IsAllowedScheme(url.origin())) if (!CanHandleType(url.type()) || !IsAllowedScheme(url.origin()))
......
webkit/browser/fileapi/sandbox_mount_point_provider.h
View file @ 96f03c48
...@@ -93,9 +93,6 @@ class WEBKIT_STORAGE_EXPORT SandboxMountPointProvider ...@@ -93,9 +93,6 @@ class WEBKIT_STORAGE_EXPORT SandboxMountPointProvider
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type, FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE; base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy( virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url, const FileSystemURL& url,
int permissions) const OVERRIDE; int permissions) const OVERRIDE;
......
webkit/browser/fileapi/test_mount_point_provider.cc
View file @ 96f03c48
...@@ -122,7 +122,7 @@ TestMountPointProvider::GetCopyOrMoveFileValidatorFactory( ...@@ -122,7 +122,7 @@ TestMountPointProvider::GetCopyOrMoveFileValidatorFactory(
} }
void TestMountPointProvider::InitializeCopyOrMoveFileValidatorFactory( void TestMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type, scoped_ptr<CopyOrMoveFileValidatorFactory> factory) { scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
if (!require_copy_or_move_validator_) { if (!require_copy_or_move_validator_) {
DCHECK(!factory); DCHECK(!factory);
return; return;
......
webkit/browser/fileapi/test_mount_point_provider.h
View file @ 96f03c48
...@@ -45,9 +45,6 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider ...@@ -45,9 +45,6 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory( virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type, FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE; base::PlatformFileError* error_code) OVERRIDE;
virtual void InitializeCopyOrMoveFileValidatorFactory(
FileSystemType type,
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy( virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url, const FileSystemURL& url,
int permissions) const OVERRIDE; int permissions) const OVERRIDE;
...@@ -71,6 +68,11 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider ...@@ -71,6 +68,11 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider
FileSystemContext* context, FileSystemContext* context,
const DeleteFileSystemCallback& callback) OVERRIDE; const DeleteFileSystemCallback& callback) OVERRIDE;
// Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
// once.
void InitializeCopyOrMoveFileValidatorFactory(
scoped_ptr<CopyOrMoveFileValidatorFactory> factory);
const UpdateObserverList* GetUpdateObservers(FileSystemType type) const; const UpdateObserverList* GetUpdateObservers(FileSystemType type) const;
// For CopyOrMoveFileValidatorFactory testing. Once it's set to true // For CopyOrMoveFileValidatorFactory testing. Once it's set to true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment