summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 08:51:32 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 08:51:32 +0000
commit96f03c488a2cb0cd52e7d5ef1d109e7ed6b387f1 (patch)
tree212b4c11a072f0e9dc62de2c4d9e67435342edb9 /webkit
parentc263e20fda620663c272543e752c2cf64f0b0f3b (diff)
downloadchromium_src-96f03c488a2cb0cd52e7d5ef1d109e7ed6b387f1.zip
chromium_src-96f03c488a2cb0cd52e7d5ef1d109e7ed6b387f1.tar.gz
chromium_src-96f03c488a2cb0cd52e7d5ef1d109e7ed6b387f1.tar.bz2
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
Diffstat (limited to 'webkit')
-rw-r--r--webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc6
-rw-r--r--webkit/browser/chromeos/fileapi/cros_mount_point_provider.h3
-rw-r--r--webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc12
-rw-r--r--webkit/browser/fileapi/file_system_mount_point_provider.h6
-rw-r--r--webkit/browser/fileapi/isolated_mount_point_provider.cc6
-rw-r--r--webkit/browser/fileapi/isolated_mount_point_provider.h3
-rw-r--r--webkit/browser/fileapi/sandbox_mount_point_provider.cc6
-rw-r--r--webkit/browser/fileapi/sandbox_mount_point_provider.h3
-rw-r--r--webkit/browser/fileapi/test_mount_point_provider.cc2
-rw-r--r--webkit/browser/fileapi/test_mount_point_provider.h8
10 files changed, 12 insertions, 43 deletions
diff --git a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc
index aa279d2..df2ebe3 100644
--- a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.cc
@@ -219,12 +219,6 @@ CrosMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL;
}
-void CrosMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
- fileapi::FileSystemType type,
- scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) {
- DCHECK(!factory);
-}
-
fileapi::FilePermissionPolicy CrosMountPointProvider::GetPermissionPolicy(
const fileapi::FileSystemURL& url, int permissions) const {
if (url.type() == fileapi::kFileSystemTypeRestrictedNativeLocal &&
diff --git a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h
index 48cba9c..4058312 100644
--- a/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h
+++ b/webkit/browser/chromeos/fileapi/cros_mount_point_provider.h
@@ -67,9 +67,6 @@ class WEBKIT_STORAGE_EXPORT CrosMountPointProvider
GetCopyOrMoveFileValidatorFactory(
fileapi::FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
- virtual void InitializeCopyOrMoveFileValidatorFactory(
- fileapi::FileSystemType type,
- scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual fileapi::FilePermissionPolicy GetPermissionPolicy(
const fileapi::FileSystemURL& url,
int permissions) const OVERRIDE;
diff --git a/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
index fb523a4..2be01c8 100644
--- a/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
@@ -88,10 +88,9 @@ class CopyOrMoveFileValidatorTestHelper {
void SetMediaCopyOrMoveFileValidatorFactory(
scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
- FileSystemMountPointProvider* mount_point_provider =
- file_system_context_->GetMountPointProvider(kWithValidatorType);
- mount_point_provider->InitializeCopyOrMoveFileValidatorFactory(
- kWithValidatorType, factory.Pass());
+ TestMountPointProvider* provider = static_cast<TestMountPointProvider*>(
+ file_system_context_->GetMountPointProvider(kWithValidatorType));
+ provider->InitializeCopyOrMoveFileValidatorFactory(factory.Pass());
}
void CopyTest(base::PlatformFileError expected) {
@@ -180,7 +179,8 @@ class TestCopyOrMoveFileValidatorFactory
: public CopyOrMoveFileValidatorFactory {
public:
// 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 CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
@@ -192,7 +192,7 @@ class TestCopyOrMoveFileValidatorFactory
private:
class TestCopyOrMoveFileValidator : public CopyOrMoveFileValidator {
public:
- TestCopyOrMoveFileValidator(bool all_valid)
+ explicit TestCopyOrMoveFileValidator(bool all_valid)
: result_(all_valid ? base::PLATFORM_FILE_OK
: base::PLATFORM_FILE_ERROR_SECURITY) {
}
diff --git a/webkit/browser/fileapi/file_system_mount_point_provider.h b/webkit/browser/fileapi/file_system_mount_point_provider.h
index bb70c10..3d1a552 100644
--- a/webkit/browser/fileapi/file_system_mount_point_provider.h
+++ b/webkit/browser/fileapi/file_system_mount_point_provider.h
@@ -78,12 +78,6 @@ class WEBKIT_STORAGE_EXPORT FileSystemMountPointProvider {
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
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|.
virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url,
diff --git a/webkit/browser/fileapi/isolated_mount_point_provider.cc b/webkit/browser/fileapi/isolated_mount_point_provider.cc
index 7d6c2ab..8c78df0 100644
--- a/webkit/browser/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/browser/fileapi/isolated_mount_point_provider.cc
@@ -105,12 +105,6 @@ IsolatedMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL;
}
-void IsolatedMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
- DCHECK(!factory);
-}
-
FilePermissionPolicy IsolatedMountPointProvider::GetPermissionPolicy(
const FileSystemURL& url, int permissions) const {
if (url.type() == kFileSystemTypeDragged && url.path().empty()) {
diff --git a/webkit/browser/fileapi/isolated_mount_point_provider.h b/webkit/browser/fileapi/isolated_mount_point_provider.h
index 653478b..b3612de 100644
--- a/webkit/browser/fileapi/isolated_mount_point_provider.h
+++ b/webkit/browser/fileapi/isolated_mount_point_provider.h
@@ -29,9 +29,6 @@ class IsolatedMountPointProvider : public FileSystemMountPointProvider {
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
- virtual void InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url,
int permissions) const OVERRIDE;
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.cc b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
index 37d5383..0527b14 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
@@ -264,12 +264,6 @@ SandboxMountPointProvider::GetCopyOrMoveFileValidatorFactory(
return NULL;
}
-void SandboxMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
- DCHECK(!factory);
-}
-
FilePermissionPolicy SandboxMountPointProvider::GetPermissionPolicy(
const FileSystemURL& url, int permissions) const {
if (!CanHandleType(url.type()) || !IsAllowedScheme(url.origin()))
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.h b/webkit/browser/fileapi/sandbox_mount_point_provider.h
index fd944fd..3ae0ed1 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider.h
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.h
@@ -93,9 +93,6 @@ class WEBKIT_STORAGE_EXPORT SandboxMountPointProvider
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
- virtual void InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url,
int permissions) const OVERRIDE;
diff --git a/webkit/browser/fileapi/test_mount_point_provider.cc b/webkit/browser/fileapi/test_mount_point_provider.cc
index 53a37a1..c005d0b 100644
--- a/webkit/browser/fileapi/test_mount_point_provider.cc
+++ b/webkit/browser/fileapi/test_mount_point_provider.cc
@@ -122,7 +122,7 @@ TestMountPointProvider::GetCopyOrMoveFileValidatorFactory(
}
void TestMountPointProvider::InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type, scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
+ scoped_ptr<CopyOrMoveFileValidatorFactory> factory) {
if (!require_copy_or_move_validator_) {
DCHECK(!factory);
return;
diff --git a/webkit/browser/fileapi/test_mount_point_provider.h b/webkit/browser/fileapi/test_mount_point_provider.h
index 7151896..d4f6628 100644
--- a/webkit/browser/fileapi/test_mount_point_provider.h
+++ b/webkit/browser/fileapi/test_mount_point_provider.h
@@ -45,9 +45,6 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider
virtual CopyOrMoveFileValidatorFactory* GetCopyOrMoveFileValidatorFactory(
FileSystemType type,
base::PlatformFileError* error_code) OVERRIDE;
- virtual void InitializeCopyOrMoveFileValidatorFactory(
- FileSystemType type,
- scoped_ptr<CopyOrMoveFileValidatorFactory> factory) OVERRIDE;
virtual FilePermissionPolicy GetPermissionPolicy(
const FileSystemURL& url,
int permissions) const OVERRIDE;
@@ -71,6 +68,11 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE TestMountPointProvider
FileSystemContext* context,
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;
// For CopyOrMoveFileValidatorFactory testing. Once it's set to true
generated by cgit v1.1 at 2025-03-07 06:07:50 +0000