diff options
Diffstat (limited to 'webkit/fileapi')
-rw-r--r-- | webkit/fileapi/file_system_context_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/file_system_file_util_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/file_system_mount_point_provider_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/file_system_quota_client_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/file_system_usage_cache_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/isolated_context_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/isolated_file_util_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/local_file_util.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/local_file_util_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/media/native_media_file_util_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/native_file_util.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/native_file_util_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/obfuscated_file_util.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/obfuscated_file_util_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/sandbox_mount_point_provider_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/fileapi/syncable/syncable_file_system_unittest.cc | 4 | ||||
-rw-r--r-- | webkit/fileapi/webfilewriter_base_unittest.cc | 6 |
17 files changed, 25 insertions, 25 deletions
diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc index 0c13501..7e82118 100644 --- a/webkit/fileapi/file_system_context_unittest.cc +++ b/webkit/fileapi/file_system_context_unittest.cc @@ -43,7 +43,7 @@ class FileSystemContextTest : public testing::Test { public: FileSystemContextTest() {} - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); storage_policy_ = new quota::MockSpecialStoragePolicy(); diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc index 9e12299..f42b6eb 100644 --- a/webkit/fileapi/file_system_file_util_unittest.cc +++ b/webkit/fileapi/file_system_file_util_unittest.cc @@ -32,7 +32,7 @@ class FileSystemFileUtilTest : public testing::Test { FileSystemFileUtilTest() { } - void SetUp() { + virtual void SetUp() { } FileSystemOperationContext* NewContext( diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc index e3abb47..c6f1c21 100644 --- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc +++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc @@ -205,7 +205,7 @@ class FileSystemMountPointProviderTest : public testing::Test { : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { } - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); special_storage_policy_ = new quota::MockSpecialStoragePolicy; } diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc index 8859ddd..7de2d9f 100644 --- a/webkit/fileapi/file_system_quota_client_unittest.cc +++ b/webkit/fileapi/file_system_quota_client_unittest.cc @@ -45,7 +45,7 @@ class FileSystemQuotaClientTest : public testing::Test { deletion_status_(quota::kQuotaStatusUnknown) { } - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); file_system_context_ = new FileSystemContext( diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc index edc4457..eecccc0 100644 --- a/webkit/fileapi/file_system_usage_cache_unittest.cc +++ b/webkit/fileapi/file_system_usage_cache_unittest.cc @@ -15,7 +15,7 @@ class FileSystemUsageCacheTest : public testing::Test { public: FileSystemUsageCacheTest() {} - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); } diff --git a/webkit/fileapi/isolated_context_unittest.cc b/webkit/fileapi/isolated_context_unittest.cc index c2c9537..15f10f8 100644 --- a/webkit/fileapi/isolated_context_unittest.cc +++ b/webkit/fileapi/isolated_context_unittest.cc @@ -48,7 +48,7 @@ class IsolatedContextTest : public testing::Test { fileset_.insert(kTestPaths[i].NormalizePathSeparators()); } - void SetUp() { + virtual void SetUp() { IsolatedContext::FileInfoSet files; for (size_t i = 0; i < arraysize(kTestPaths); ++i) { std::string name; @@ -61,7 +61,7 @@ class IsolatedContextTest : public testing::Test { ASSERT_FALSE(id_.empty()); } - void TearDown() { + virtual void TearDown() { IsolatedContext::GetInstance()->RemoveReference(id_); } diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc index 4652372..448cbef 100644 --- a/webkit/fileapi/isolated_file_util_unittest.cc +++ b/webkit/fileapi/isolated_file_util_unittest.cc @@ -68,7 +68,7 @@ class IsolatedFileUtilTest : public testing::Test { IsolatedFileUtilTest() : other_file_util_helper_(GURL("http://foo/"), kFileSystemTypeTest) {} - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(partition_dir_.CreateUniqueTempDir()); file_util_.reset(new DraggedFileUtil()); @@ -91,7 +91,7 @@ class IsolatedFileUtilTest : public testing::Test { isolated_context()->AddReference(filesystem_id_); } - void TearDown() { + virtual void TearDown() { isolated_context()->RemoveReference(filesystem_id_); other_file_util_helper_.TearDown(); } diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc index 4b533c9..57454eb 100644 --- a/webkit/fileapi/local_file_util.cc +++ b/webkit/fileapi/local_file_util.cc @@ -32,7 +32,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator { #endif // defined(OS_WIN) } - ~LocalFileEnumerator() {} + virtual ~LocalFileEnumerator() {} virtual base::FilePath Next() OVERRIDE; virtual int64 Size() OVERRIDE; diff --git a/webkit/fileapi/local_file_util_unittest.cc b/webkit/fileapi/local_file_util_unittest.cc index fc3175a..0d7df03 100644 --- a/webkit/fileapi/local_file_util_unittest.cc +++ b/webkit/fileapi/local_file_util_unittest.cc @@ -28,12 +28,12 @@ class LocalFileUtilTest : public testing::Test { LocalFileUtilTest() : test_helper_(GURL("http://foo/"), kFileSystemTypeTest) {} - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); test_helper_.SetUp(data_dir_.path()); } - void TearDown() { + virtual void TearDown() { test_helper_.TearDown(); } diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc index f98379b..71afc1c 100644 --- a/webkit/fileapi/media/native_media_file_util_unittest.cc +++ b/webkit/fileapi/media/native_media_file_util_unittest.cc @@ -104,7 +104,7 @@ class NativeMediaFileUtilTest : public testing::Test { : file_util_(NULL) { } - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); ASSERT_TRUE(file_util::CreateDirectory(root_path())); @@ -128,7 +128,7 @@ class NativeMediaFileUtilTest : public testing::Test { isolated_context()->AddReference(filesystem_id_); } - void TearDown() { + virtual void TearDown() { isolated_context()->RemoveReference(filesystem_id_); file_system_context_ = NULL; } diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc index a794250..ff82e77 100644 --- a/webkit/fileapi/native_file_util.cc +++ b/webkit/fileapi/native_file_util.cc @@ -47,7 +47,7 @@ class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator { #endif // defined(OS_WIN) } - ~NativeFileEnumerator() {} + virtual ~NativeFileEnumerator() {} virtual base::FilePath Next() OVERRIDE; virtual int64 Size() OVERRIDE; diff --git a/webkit/fileapi/native_file_util_unittest.cc b/webkit/fileapi/native_file_util_unittest.cc index 2121a3e..e395a57 100644 --- a/webkit/fileapi/native_file_util_unittest.cc +++ b/webkit/fileapi/native_file_util_unittest.cc @@ -14,7 +14,7 @@ class NativeFileUtilTest : public testing::Test { public: NativeFileUtilTest() {} - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); } diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc index 657eef1..b2a8462 100644 --- a/webkit/fileapi/obfuscated_file_util.cc +++ b/webkit/fileapi/obfuscated_file_util.cc @@ -214,7 +214,7 @@ class ObfuscatedOriginEnumerator origin_database->ListAllOrigins(&origins_); } - ~ObfuscatedOriginEnumerator() {} + virtual ~ObfuscatedOriginEnumerator() {} // Returns the next origin. Returns empty if there are no more origins. virtual GURL Next() OVERRIDE { diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc index a481c0c..ef0f2bc 100644 --- a/webkit/fileapi/obfuscated_file_util_unittest.cc +++ b/webkit/fileapi/obfuscated_file_util_unittest.cc @@ -106,7 +106,7 @@ class ObfuscatedFileUtilTest : public testing::Test { usage_(-1) { } - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); scoped_refptr<quota::SpecialStoragePolicy> storage_policy = @@ -135,7 +135,7 @@ class ObfuscatedFileUtilTest : public testing::Test { change_observers_ = MockFileChangeObserver::CreateList(&change_observer_); } - void TearDown() { + virtual void TearDown() { quota_manager_ = NULL; test_helper_.TearDown(); } diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc index 9d51114..abdd2feb 100644 --- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc +++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc @@ -22,7 +22,7 @@ namespace fileapi { class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test { public: - void SetUp() { + virtual void SetUp() { ASSERT_TRUE(data_dir_.CreateUniqueTempDir()); sandbox_provider_.reset( new SandboxMountPointProvider( diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc index d2ad547..255a039 100644 --- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc +++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc @@ -31,7 +31,7 @@ class SyncableFileSystemTest : public testing::Test { base::MessageLoopProxy::current()), weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {} - void SetUp() { + virtual void SetUp() { file_system_.SetUp(); sync_context_ = new LocalFileSyncContext(base::MessageLoopProxy::current(), @@ -40,7 +40,7 @@ class SyncableFileSystemTest : public testing::Test { file_system_.MaybeInitializeFileSystemContext(sync_context_)); } - void TearDown() { + virtual void TearDown() { if (sync_context_) sync_context_->ShutdownOnUIThread(); sync_context_ = NULL; diff --git a/webkit/fileapi/webfilewriter_base_unittest.cc b/webkit/fileapi/webfilewriter_base_unittest.cc index 285efa9..828d904 100644 --- a/webkit/fileapi/webfilewriter_base_unittest.cc +++ b/webkit/fileapi/webfilewriter_base_unittest.cc @@ -65,7 +65,7 @@ class TestableFileWriter : public WebFileWriterBase { bool received_cancel_; protected: - virtual void DoTruncate(const GURL& path, int64 offset) { + virtual void DoTruncate(const GURL& path, int64 offset) OVERRIDE { received_truncate_ = true; received_truncate_path_ = path; received_truncate_offset_ = offset; @@ -88,7 +88,7 @@ class TestableFileWriter : public WebFileWriterBase { } virtual void DoWrite(const GURL& path, const GURL& blob_url, - int64 offset) { + int64 offset) OVERRIDE { received_write_ = true; received_write_path_ = path; received_write_offset_ = offset; @@ -121,7 +121,7 @@ class TestableFileWriter : public WebFileWriterBase { } } - virtual void DoCancel() { + virtual void DoCancel() OVERRIDE { received_cancel_ = true; } }; |