summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:07:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:08:25 +0000
commitc2282aa89148883769f87c74cc3c4608c0933489 (patch)
treeffa48a41ac574fc701cac64f5457dfc08d2c0c27 /content/browser/fileapi
parentc793742b02142aed967568c48def709d6d16bd38 (diff)
downloadchromium_src-c2282aa89148883769f87c74cc3c4608c0933489.zip
chromium_src-c2282aa89148883769f87c74cc3c4608c0933489.tar.gz
chromium_src-c2282aa89148883769f87c74cc3c4608c0933489.tar.bz2
Standardize usage of virtual/override/final in content/browser/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/667943003 Cr-Commit-Position: refs/heads/master@{#300469}
Diffstat (limited to 'content/browser/fileapi')
-rw-r--r--content/browser/fileapi/blob_url_request_job_unittest.cc2
-rw-r--r--content/browser/fileapi/chrome_blob_storage_context.cc6
-rw-r--r--content/browser/fileapi/copy_or_move_file_validator_unittest.cc10
-rw-r--r--content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc10
-rw-r--r--content/browser/fileapi/file_system_browsertest.cc2
-rw-r--r--content/browser/fileapi/file_system_dir_url_request_job_unittest.cc10
-rw-r--r--content/browser/fileapi/file_system_url_request_job_unittest.cc10
-rw-r--r--content/browser/fileapi/file_writer_delegate_unittest.cc20
-rw-r--r--content/browser/fileapi/fileapi_message_filter.h12
-rw-r--r--content/browser/fileapi/mock_file_change_observer.h16
-rw-r--r--content/browser/fileapi/mock_file_update_observer.h8
-rw-r--r--content/browser/fileapi/mock_url_request_delegate.h7
-rw-r--r--content/browser/fileapi/recursive_operation_delegate_unittest.cc22
-rw-r--r--content/browser/fileapi/upload_file_system_file_element_reader.h14
14 files changed, 67 insertions, 82 deletions
diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc
index 5341292..4c7d607 100644
--- a/content/browser/fileapi/blob_url_request_job_unittest.cc
+++ b/content/browser/fileapi/blob_url_request_job_unittest.cc
@@ -61,7 +61,7 @@ class BlobURLRequestJobTest : public testing::Test {
MockProtocolHandler(BlobURLRequestJobTest* test) : test_(test) {}
// net::URLRequestJobFactory::ProtocolHandler override.
- virtual net::URLRequestJob* MaybeCreateJob(
+ net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const override {
return new BlobURLRequestJob(request,
diff --git a/content/browser/fileapi/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc
index 7c59ed4..f085242 100644
--- a/content/browser/fileapi/chrome_blob_storage_context.cc
+++ b/content/browser/fileapi/chrome_blob_storage_context.cc
@@ -27,11 +27,9 @@ class BlobHandleImpl : public BlobHandle {
: handle_(handle.Pass()) {
}
- virtual ~BlobHandleImpl() {}
+ ~BlobHandleImpl() override {}
- virtual std::string GetUUID() override {
- return handle_->uuid();
- }
+ std::string GetUUID() override { return handle_->uuid(); }
private:
scoped_ptr<storage::BlobDataHandle> handle_;
diff --git a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc
index f416462..ea2ba89 100644
--- a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc
@@ -197,9 +197,9 @@ class TestCopyOrMoveFileValidatorFactory
// TODO(gbillock): switch args to enum or something
explicit TestCopyOrMoveFileValidatorFactory(Validity validity)
: validity_(validity) {}
- virtual ~TestCopyOrMoveFileValidatorFactory() {}
+ ~TestCopyOrMoveFileValidatorFactory() override {}
- virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
+ storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
const FileSystemURL& /*src_url*/,
const base::FilePath& /*platform_path*/) override {
return new TestCopyOrMoveFileValidator(validity_);
@@ -216,16 +216,16 @@ class TestCopyOrMoveFileValidatorFactory
base::File::FILE_OK :
base::File::FILE_ERROR_SECURITY) {
}
- virtual ~TestCopyOrMoveFileValidator() {}
+ ~TestCopyOrMoveFileValidator() override {}
- virtual void StartPreWriteValidation(
+ void StartPreWriteValidation(
const ResultCallback& result_callback) override {
// Post the result since a real validator must do work asynchronously.
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(result_callback, result_));
}
- virtual void StartPostWriteValidation(
+ void StartPostWriteValidation(
const base::FilePath& dest_platform_path,
const ResultCallback& result_callback) override {
// Post the result since a real validator must do work asynchronously.
diff --git a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
index 2cb9911..a50d4a0 100644
--- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -52,9 +52,9 @@ class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
public:
// A factory that creates validators that accept everything or nothing.
TestValidatorFactory() {}
- virtual ~TestValidatorFactory() {}
+ ~TestValidatorFactory() override {}
- virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
+ storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
const FileSystemURL& /*src_url*/,
const base::FilePath& /*platform_path*/) override {
// Move arg management to TestValidator?
@@ -73,16 +73,16 @@ class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
base::File::FILE_ERROR_SECURITY),
reject_string_(reject_string) {
}
- virtual ~TestValidator() {}
+ ~TestValidator() override {}
- virtual void StartPreWriteValidation(
+ void StartPreWriteValidation(
const ResultCallback& result_callback) override {
// Post the result since a real validator must do work asynchronously.
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(result_callback, result_));
}
- virtual void StartPostWriteValidation(
+ void StartPostWriteValidation(
const base::FilePath& dest_platform_path,
const ResultCallback& result_callback) override {
base::File::Error result = write_result_;
diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc
index dac5eff..804f04e 100644
--- a/content/browser/fileapi/file_system_browsertest.cc
+++ b/content/browser/fileapi/file_system_browsertest.cc
@@ -51,7 +51,7 @@ class FileSystemBrowserTest : public ContentBrowserTest {
class FileSystemBrowserTestWithLowQuota : public FileSystemBrowserTest {
public:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
const int kInitialQuotaKilobytes = 5000;
const int kTemporaryStorageQuotaMaxSize =
kInitialQuotaKilobytes * 1024 * QuotaManager::kPerHostTemporaryPortion;
diff --git a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
index 356988a..d2a6abc 100644
--- a/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -80,7 +80,7 @@ class FileSystemDirURLRequestJobFactory : public net::URLRequestJobFactory {
: storage_domain_(storage_domain), file_system_context_(context) {
}
- virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const override {
@@ -88,15 +88,13 @@ class FileSystemDirURLRequestJobFactory : public net::URLRequestJobFactory {
request, network_delegate, storage_domain_, file_system_context_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const override {
+ bool IsHandledProtocol(const std::string& scheme) const override {
return true;
}
- virtual bool IsHandledURL(const GURL& url) const override {
- return true;
- }
+ bool IsHandledURL(const GURL& url) const override { return true; }
- virtual bool IsSafeRedirectTarget(const GURL& location) const override {
+ bool IsSafeRedirectTarget(const GURL& location) const override {
return false;
}
diff --git a/content/browser/fileapi/file_system_url_request_job_unittest.cc b/content/browser/fileapi/file_system_url_request_job_unittest.cc
index 19f5614..5f8c0cd 100644
--- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -89,7 +89,7 @@ class FileSystemURLRequestJobFactory : public net::URLRequestJobFactory {
: storage_domain_(storage_domain), file_system_context_(context) {
}
- virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const override {
@@ -97,15 +97,13 @@ class FileSystemURLRequestJobFactory : public net::URLRequestJobFactory {
request, network_delegate, storage_domain_, file_system_context_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const override {
+ bool IsHandledProtocol(const std::string& scheme) const override {
return true;
}
- virtual bool IsHandledURL(const GURL& url) const override {
- return true;
- }
+ bool IsHandledURL(const GURL& url) const override { return true; }
- virtual bool IsSafeRedirectTarget(const GURL& location) const override {
+ bool IsSafeRedirectTarget(const GURL& location) const override {
return false;
}
diff --git a/content/browser/fileapi/file_writer_delegate_unittest.cc b/content/browser/fileapi/file_writer_delegate_unittest.cc
index af4dd3b..12e288c 100644
--- a/content/browser/fileapi/file_writer_delegate_unittest.cc
+++ b/content/browser/fileapi/file_writer_delegate_unittest.cc
@@ -175,15 +175,13 @@ class FileWriterDelegateTestJob : public net::URLRequestJob {
cursor_(0) {
}
- virtual void Start() override {
+ void Start() override {
base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&FileWriterDelegateTestJob::NotifyHeadersComplete, this));
}
- virtual bool ReadRawData(net::IOBuffer* buf,
- int buf_size,
- int *bytes_read) override {
+ bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override {
if (remaining_bytes_ < buf_size)
buf_size = static_cast<int>(remaining_bytes_);
@@ -196,12 +194,10 @@ class FileWriterDelegateTestJob : public net::URLRequestJob {
return true;
}
- virtual int GetResponseCode() const override {
- return 200;
- }
+ int GetResponseCode() const override { return 200; }
protected:
- virtual ~FileWriterDelegateTestJob() {}
+ ~FileWriterDelegateTestJob() override {}
private:
std::string content_;
@@ -215,7 +211,7 @@ class BlobURLRequestJobFactory : public net::URLRequestJobFactory {
: content_data_(content_data) {
}
- virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const override {
@@ -223,15 +219,15 @@ class BlobURLRequestJobFactory : public net::URLRequestJobFactory {
request, network_delegate, *content_data_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const override {
+ bool IsHandledProtocol(const std::string& scheme) const override {
return scheme == "blob";
}
- virtual bool IsHandledURL(const GURL& url) const override {
+ bool IsHandledURL(const GURL& url) const override {
return url.SchemeIs("blob");
}
- virtual bool IsSafeRedirectTarget(const GURL& location) const override {
+ bool IsSafeRedirectTarget(const GURL& location) const override {
return true;
}
diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h
index 2506eed..297213d 100644
--- a/content/browser/fileapi/fileapi_message_filter.h
+++ b/content/browser/fileapi/fileapi_message_filter.h
@@ -73,16 +73,16 @@ class CONTENT_EXPORT FileAPIMessageFilter : public BrowserMessageFilter {
StreamContext* stream_context);
// BrowserMessageFilter implementation.
- virtual void OnChannelConnected(int32 peer_pid) override;
- virtual void OnChannelClosing() override;
- virtual base::TaskRunner* OverrideTaskRunnerForMessage(
+ void OnChannelConnected(int32 peer_pid) override;
+ void OnChannelClosing() override;
+ base::TaskRunner* OverrideTaskRunnerForMessage(
const IPC::Message& message) override;
- virtual bool OnMessageReceived(const IPC::Message& message) override;
+ bool OnMessageReceived(const IPC::Message& message) override;
protected:
- virtual ~FileAPIMessageFilter();
+ ~FileAPIMessageFilter() override;
- virtual void BadMessageReceived() override;
+ void BadMessageReceived() override;
private:
typedef storage::FileSystemOperationRunner::OperationID OperationID;
diff --git a/content/browser/fileapi/mock_file_change_observer.h b/content/browser/fileapi/mock_file_change_observer.h
index db110ac..3465a7a 100644
--- a/content/browser/fileapi/mock_file_change_observer.h
+++ b/content/browser/fileapi/mock_file_change_observer.h
@@ -17,19 +17,19 @@ namespace storage {
class MockFileChangeObserver : public FileChangeObserver {
public:
MockFileChangeObserver();
- virtual ~MockFileChangeObserver();
+ ~MockFileChangeObserver() override;
// Creates a ChangeObserverList which only contains given |observer|.
static ChangeObserverList CreateList(MockFileChangeObserver* observer);
// FileChangeObserver overrides.
- virtual void OnCreateFile(const FileSystemURL& url) override;
- virtual void OnCreateFileFrom(const FileSystemURL& url,
- const FileSystemURL& src) override;
- virtual void OnRemoveFile(const FileSystemURL& url) override;
- virtual void OnModifyFile(const FileSystemURL& url) override;
- virtual void OnCreateDirectory(const FileSystemURL& url) override;
- virtual void OnRemoveDirectory(const FileSystemURL& url) override;
+ void OnCreateFile(const FileSystemURL& url) override;
+ void OnCreateFileFrom(const FileSystemURL& url,
+ const FileSystemURL& src) override;
+ void OnRemoveFile(const FileSystemURL& url) override;
+ void OnModifyFile(const FileSystemURL& url) override;
+ void OnCreateDirectory(const FileSystemURL& url) override;
+ void OnRemoveDirectory(const FileSystemURL& url) override;
void ResetCount() {
create_file_count_ = 0;
diff --git a/content/browser/fileapi/mock_file_update_observer.h b/content/browser/fileapi/mock_file_update_observer.h
index b01c6c9..78aef9f 100644
--- a/content/browser/fileapi/mock_file_update_observer.h
+++ b/content/browser/fileapi/mock_file_update_observer.h
@@ -19,15 +19,15 @@ namespace storage {
class MockFileUpdateObserver : public FileUpdateObserver {
public:
MockFileUpdateObserver();
- virtual ~MockFileUpdateObserver();
+ ~MockFileUpdateObserver() override;
// Creates a ChangeObserverList which only contains given |observer|.
static UpdateObserverList CreateList(MockFileUpdateObserver* observer);
// FileUpdateObserver overrides.
- virtual void OnStartUpdate(const FileSystemURL& url) override;
- virtual void OnUpdate(const FileSystemURL& url, int64 delta) override;
- virtual void OnEndUpdate(const FileSystemURL& url) override;
+ void OnStartUpdate(const FileSystemURL& url) override;
+ void OnUpdate(const FileSystemURL& url, int64 delta) override;
+ void OnEndUpdate(const FileSystemURL& url) override;
void Enable() { is_ready_ = true; }
diff --git a/content/browser/fileapi/mock_url_request_delegate.h b/content/browser/fileapi/mock_url_request_delegate.h
index ef301ae..a628f6e 100644
--- a/content/browser/fileapi/mock_url_request_delegate.h
+++ b/content/browser/fileapi/mock_url_request_delegate.h
@@ -17,11 +17,10 @@ namespace content {
class MockURLRequestDelegate : public net::URLRequest::Delegate {
public:
MockURLRequestDelegate();
- virtual ~MockURLRequestDelegate();
+ ~MockURLRequestDelegate() override;
- virtual void OnResponseStarted(net::URLRequest* request) override;
- virtual void OnReadCompleted(net::URLRequest* request,
- int bytes_read) override;
+ void OnResponseStarted(net::URLRequest* request) override;
+ void OnReadCompleted(net::URLRequest* request, int bytes_read) override;
const std::string& response_data() const { return response_data_; }
private:
diff --git a/content/browser/fileapi/recursive_operation_delegate_unittest.cc b/content/browser/fileapi/recursive_operation_delegate_unittest.cc
index 58e935e..f57722f 100644
--- a/content/browser/fileapi/recursive_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/recursive_operation_delegate_unittest.cc
@@ -45,21 +45,17 @@ class LoggingRecursiveOperation : public storage::RecursiveOperationDelegate {
root_(root),
callback_(callback),
weak_factory_(this) {}
- virtual ~LoggingRecursiveOperation() {}
+ ~LoggingRecursiveOperation() override {}
const std::vector<LogEntry>& log_entries() const { return log_entries_; }
// RecursiveOperationDelegate overrides.
- virtual void Run() override {
- NOTREACHED();
- }
+ void Run() override { NOTREACHED(); }
- virtual void RunRecursively() override {
- StartRecursiveOperation(root_, callback_);
- }
+ void RunRecursively() override { StartRecursiveOperation(root_, callback_); }
- virtual void ProcessFile(const FileSystemURL& url,
- const StatusCallback& callback) override {
+ void ProcessFile(const FileSystemURL& url,
+ const StatusCallback& callback) override {
RecordLogEntry(LogEntry::PROCESS_FILE, url);
operation_runner()->GetMetadata(
url,
@@ -67,14 +63,14 @@ class LoggingRecursiveOperation : public storage::RecursiveOperationDelegate {
weak_factory_.GetWeakPtr(), callback));
}
- virtual void ProcessDirectory(const FileSystemURL& url,
- const StatusCallback& callback) override {
+ void ProcessDirectory(const FileSystemURL& url,
+ const StatusCallback& callback) override {
RecordLogEntry(LogEntry::PROCESS_DIRECTORY, url);
callback.Run(base::File::FILE_OK);
}
- virtual void PostProcessDirectory(const FileSystemURL& url,
- const StatusCallback& callback) override {
+ void PostProcessDirectory(const FileSystemURL& url,
+ const StatusCallback& callback) override {
RecordLogEntry(LogEntry::POST_PROCESS_DIRECTORY, url);
callback.Run(base::File::FILE_OK);
}
diff --git a/content/browser/fileapi/upload_file_system_file_element_reader.h b/content/browser/fileapi/upload_file_system_file_element_reader.h
index 806473e..bc2a6f7 100644
--- a/content/browser/fileapi/upload_file_system_file_element_reader.h
+++ b/content/browser/fileapi/upload_file_system_file_element_reader.h
@@ -31,15 +31,15 @@ class CONTENT_EXPORT UploadFileSystemFileElementReader :
uint64 range_offset,
uint64 range_length,
const base::Time& expected_modification_time);
- virtual ~UploadFileSystemFileElementReader();
+ ~UploadFileSystemFileElementReader() override;
// UploadElementReader overrides:
- virtual int Init(const net::CompletionCallback& callback) override;
- virtual uint64 GetContentLength() const override;
- virtual uint64 BytesRemaining() const override;
- virtual int Read(net::IOBuffer* buf,
- int buf_length,
- const net::CompletionCallback& callback) override;
+ int Init(const net::CompletionCallback& callback) override;
+ uint64 GetContentLength() const override;
+ uint64 BytesRemaining() const override;
+ int Read(net::IOBuffer* buf,
+ int buf_length,
+ const net::CompletionCallback& callback) override;
private:
void OnGetLength(const net::CompletionCallback& callback, int64 result);
generated by cgit v1.1 at 2025-04-02 22:55:46 +0000