summaryrefslogtreecommitdiffstats
path: root/content/browser/fileapi
diff options
context:
space:
mode:
authormohan.reddy <mohan.reddy@samsung.com>2014-10-06 22:54:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 05:54:52 +0000
commite1177d0e38056ce91a8ef0fccc5bccd97a5bbb0d (patch)
treeda2a36fc1738d2e7ad50d7c6c0ce9a17b2c1a2cd /content/browser/fileapi
parentd7f545eacae6e1456c3d7e78c38c5a68239c453f (diff)
downloadchromium_src-e1177d0e38056ce91a8ef0fccc5bccd97a5bbb0d.zip
chromium_src-e1177d0e38056ce91a8ef0fccc5bccd97a5bbb0d.tar.gz
chromium_src-e1177d0e38056ce91a8ef0fccc5bccd97a5bbb0d.tar.bz2
Replacing the OVERRIDE with override and FINAL with final in content/browser/fileapi
This step is a giant search and replace for OVERRIDE and FINAL to replace them with their lowercase versions. BUG=417463 Review URL: https://codereview.chromium.org/623933003 Cr-Commit-Position: refs/heads/master@{#298389}
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.cc2
-rw-r--r--content/browser/fileapi/copy_or_move_file_validator_unittest.cc6
-rw-r--r--content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc6
-rw-r--r--content/browser/fileapi/file_system_browsertest.cc2
-rw-r--r--content/browser/fileapi/file_system_dir_url_request_job_unittest.cc12
-rw-r--r--content/browser/fileapi/file_system_file_stream_reader_unittest.cc4
-rw-r--r--content/browser/fileapi/file_system_operation_impl_unittest.cc4
-rw-r--r--content/browser/fileapi/file_system_operation_runner_unittest.cc4
-rw-r--r--content/browser/fileapi/file_system_url_request_job_unittest.cc12
-rw-r--r--content/browser/fileapi/file_writer_delegate_unittest.cc18
-rw-r--r--content/browser/fileapi/fileapi_message_filter.h10
-rw-r--r--content/browser/fileapi/fileapi_message_filter_unittest.cc2
-rw-r--r--content/browser/fileapi/local_file_stream_reader_unittest.cc4
-rw-r--r--content/browser/fileapi/local_file_stream_writer_unittest.cc4
-rw-r--r--content/browser/fileapi/mock_file_change_observer.h12
-rw-r--r--content/browser/fileapi/mock_file_update_observer.h6
-rw-r--r--content/browser/fileapi/mock_url_request_delegate.h4
-rw-r--r--content/browser/fileapi/plugin_private_file_system_backend_unittest.cc2
-rw-r--r--content/browser/fileapi/recursive_operation_delegate_unittest.cc14
-rw-r--r--content/browser/fileapi/transient_file_util_unittest.cc4
-rw-r--r--content/browser/fileapi/upload_file_system_file_element_reader.h8
-rw-r--r--content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc4
23 files changed, 73 insertions, 73 deletions
diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc
index e460549..5341292 100644
--- a/content/browser/fileapi/blob_url_request_job_unittest.cc
+++ b/content/browser/fileapi/blob_url_request_job_unittest.cc
@@ -63,7 +63,7 @@ class BlobURLRequestJobTest : public testing::Test {
// net::URLRequestJobFactory::ProtocolHandler override.
virtual net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
return new BlobURLRequestJob(request,
network_delegate,
test_->blob_data_.get(),
diff --git a/content/browser/fileapi/chrome_blob_storage_context.cc b/content/browser/fileapi/chrome_blob_storage_context.cc
index d744e05..7c59ed4 100644
--- a/content/browser/fileapi/chrome_blob_storage_context.cc
+++ b/content/browser/fileapi/chrome_blob_storage_context.cc
@@ -29,7 +29,7 @@ class BlobHandleImpl : public BlobHandle {
virtual ~BlobHandleImpl() {}
- virtual std::string GetUUID() OVERRIDE {
+ virtual std::string GetUUID() override {
return handle_->uuid();
}
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 7b44723..f416462 100644
--- a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc
@@ -201,7 +201,7 @@ class TestCopyOrMoveFileValidatorFactory
virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
const FileSystemURL& /*src_url*/,
- const base::FilePath& /*platform_path*/) OVERRIDE {
+ const base::FilePath& /*platform_path*/) override {
return new TestCopyOrMoveFileValidator(validity_);
}
@@ -219,7 +219,7 @@ class TestCopyOrMoveFileValidatorFactory
virtual ~TestCopyOrMoveFileValidator() {}
virtual void StartPreWriteValidation(
- const ResultCallback& result_callback) OVERRIDE {
+ 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_));
@@ -227,7 +227,7 @@ class TestCopyOrMoveFileValidatorFactory
virtual void StartPostWriteValidation(
const base::FilePath& dest_platform_path,
- const ResultCallback& result_callback) OVERRIDE {
+ 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, write_result_));
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 3b79b18..2cb9911 100644
--- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -56,7 +56,7 @@ class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
const FileSystemURL& /*src_url*/,
- const base::FilePath& /*platform_path*/) OVERRIDE {
+ const base::FilePath& /*platform_path*/) override {
// Move arg management to TestValidator?
return new TestValidator(true, true, std::string("2"));
}
@@ -76,7 +76,7 @@ class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
virtual ~TestValidator() {}
virtual void StartPreWriteValidation(
- const ResultCallback& result_callback) OVERRIDE {
+ 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_));
@@ -84,7 +84,7 @@ class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
virtual void StartPostWriteValidation(
const base::FilePath& dest_platform_path,
- const ResultCallback& result_callback) OVERRIDE {
+ const ResultCallback& result_callback) override {
base::File::Error result = write_result_;
std::string unsafe = dest_platform_path.BaseName().AsUTF8Unsafe();
if (unsafe.find(reject_string_) != std::string::npos) {
diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc
index 4d2da55..dac5eff 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 {
+ virtual 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 4a011b1..356988a 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
@@ -83,20 +83,20 @@ class FileSystemDirURLRequestJobFactory : public net::URLRequestJobFactory {
virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
return new storage::FileSystemDirURLRequestJob(
request, network_delegate, storage_domain_, file_system_context_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE {
+ virtual bool IsHandledProtocol(const std::string& scheme) const override {
return true;
}
- virtual bool IsHandledURL(const GURL& url) const OVERRIDE {
+ virtual bool IsHandledURL(const GURL& url) const override {
return true;
}
- virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE {
+ virtual bool IsSafeRedirectTarget(const GURL& location) const override {
return false;
}
@@ -114,7 +114,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
: weak_factory_(this) {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
special_storage_policy_ = new MockSpecialStoragePolicy;
@@ -130,7 +130,7 @@ class FileSystemDirURLRequestJobTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// NOTE: order matters, request must die before delegate
request_.reset(NULL);
delegate_.reset(NULL);
diff --git a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
index fec667a..d927ce4 100644
--- a/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
+++ b/content/browser/fileapi/file_system_file_stream_reader_unittest.cc
@@ -67,7 +67,7 @@ class FileSystemFileStreamReaderTest : public testing::Test {
public:
FileSystemFileStreamReaderTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
file_system_context_ = CreateFileSystemContextForTesting(
@@ -84,7 +84,7 @@ class FileSystemFileStreamReaderTest : public testing::Test {
&test_file_modification_time_);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
base::RunLoop().RunUntilIdle();
}
diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc
index a49cc88..af2d078 100644
--- a/content/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -48,7 +48,7 @@ class FileSystemOperationImplTest
FileSystemOperationImplTest() : weak_factory_(this) {}
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
EXPECT_TRUE(base_.CreateUniqueTempDir());
change_observers_ =
storage::MockFileChangeObserver::CreateList(&change_observer_);
@@ -70,7 +70,7 @@ class FileSystemOperationImplTest
update_observer_.Disable();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Let the client go away before dropping a ref of the quota manager proxy.
quota_manager_proxy()->SimulateQuotaManagerDestroyed();
quota_manager_ = NULL;
diff --git a/content/browser/fileapi/file_system_operation_runner_unittest.cc b/content/browser/fileapi/file_system_operation_runner_unittest.cc
index 3d6bfa6..e00b205 100644
--- a/content/browser/fileapi/file_system_operation_runner_unittest.cc
+++ b/content/browser/fileapi/file_system_operation_runner_unittest.cc
@@ -42,14 +42,14 @@ class FileSystemOperationRunnerTest : public testing::Test {
FileSystemOperationRunnerTest() {}
virtual ~FileSystemOperationRunnerTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(base_.CreateUniqueTempDir());
base::FilePath base_dir = base_.path();
file_system_context_ =
CreateFileSystemContextForTesting(NULL, base_dir);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
file_system_context_ = NULL;
base::RunLoop().RunUntilIdle();
}
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 e20e07f..19f5614 100644
--- a/content/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/content/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -92,20 +92,20 @@ class FileSystemURLRequestJobFactory : public net::URLRequestJobFactory {
virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
return new storage::FileSystemURLRequestJob(
request, network_delegate, storage_domain_, file_system_context_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE {
+ virtual bool IsHandledProtocol(const std::string& scheme) const override {
return true;
}
- virtual bool IsHandledURL(const GURL& url) const OVERRIDE {
+ virtual bool IsHandledURL(const GURL& url) const override {
return true;
}
- virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE {
+ virtual bool IsSafeRedirectTarget(const GURL& location) const override {
return false;
}
@@ -121,7 +121,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
FileSystemURLRequestJobTest() : weak_factory_(this) {
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
// We use the main thread so that we can get the root path synchronously.
@@ -138,7 +138,7 @@ class FileSystemURLRequestJobTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// FileReader posts a task to close the file in destructor.
base::RunLoop().RunUntilIdle();
}
diff --git a/content/browser/fileapi/file_writer_delegate_unittest.cc b/content/browser/fileapi/file_writer_delegate_unittest.cc
index 5a4570f..b3a4b9f 100644
--- a/content/browser/fileapi/file_writer_delegate_unittest.cc
+++ b/content/browser/fileapi/file_writer_delegate_unittest.cc
@@ -84,8 +84,8 @@ class FileWriterDelegateTest : public PlatformTest {
FileWriterDelegateTest() {}
protected:
- virtual void SetUp() OVERRIDE;
- virtual void TearDown() OVERRIDE;
+ virtual void SetUp() override;
+ virtual void TearDown() override;
int64 usage() {
return file_system_context_->GetQuotaUtil(kFileSystemType)
@@ -175,7 +175,7 @@ class FileWriterDelegateTestJob : public net::URLRequestJob {
cursor_(0) {
}
- virtual void Start() OVERRIDE {
+ virtual void Start() override {
base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(&FileWriterDelegateTestJob::NotifyHeadersComplete, this));
@@ -183,7 +183,7 @@ class FileWriterDelegateTestJob : public net::URLRequestJob {
virtual bool ReadRawData(net::IOBuffer* buf,
int buf_size,
- int *bytes_read) OVERRIDE {
+ int *bytes_read) override {
if (remaining_bytes_ < buf_size)
buf_size = static_cast<int>(remaining_bytes_);
@@ -196,7 +196,7 @@ class FileWriterDelegateTestJob : public net::URLRequestJob {
return true;
}
- virtual int GetResponseCode() const OVERRIDE {
+ virtual int GetResponseCode() const override {
return 200;
}
@@ -218,20 +218,20 @@ class BlobURLRequestJobFactory : public net::URLRequestJobFactory {
virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
return new FileWriterDelegateTestJob(
request, network_delegate, *content_data_);
}
- virtual bool IsHandledProtocol(const std::string& scheme) const OVERRIDE {
+ virtual bool IsHandledProtocol(const std::string& scheme) const override {
return scheme == "blob";
}
- virtual bool IsHandledURL(const GURL& url) const OVERRIDE {
+ virtual bool IsHandledURL(const GURL& url) const override {
return url.SchemeIs("blob");
}
- virtual bool IsSafeRedirectTarget(const GURL& location) const OVERRIDE {
+ virtual 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 ded3614..2506eed 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 void OnChannelConnected(int32 peer_pid) override;
+ virtual void OnChannelClosing() override;
virtual base::TaskRunner* OverrideTaskRunnerForMessage(
- const IPC::Message& message) OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+ const IPC::Message& message) override;
+ virtual bool OnMessageReceived(const IPC::Message& message) override;
protected:
virtual ~FileAPIMessageFilter();
- virtual void BadMessageReceived() OVERRIDE;
+ virtual void BadMessageReceived() override;
private:
typedef storage::FileSystemOperationRunner::OperationID OperationID;
diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc
index a674a93..1e915bd 100644
--- a/content/browser/fileapi/fileapi_message_filter_unittest.cc
+++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc
@@ -48,7 +48,7 @@ class FileAPIMessageFilterTest : public testing::Test {
}
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
file_system_context_ =
CreateFileSystemContextForTesting(NULL, base::FilePath());
diff --git a/content/browser/fileapi/local_file_stream_reader_unittest.cc b/content/browser/fileapi/local_file_stream_reader_unittest.cc
index e7639a3..3e02994 100644
--- a/content/browser/fileapi/local_file_stream_reader_unittest.cc
+++ b/content/browser/fileapi/local_file_stream_reader_unittest.cc
@@ -64,7 +64,7 @@ class LocalFileStreamReaderTest : public testing::Test {
LocalFileStreamReaderTest()
: file_thread_("FileUtilProxyTestFileThread") {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(file_thread_.Start());
ASSERT_TRUE(dir_.CreateUniqueTempDir());
@@ -74,7 +74,7 @@ class LocalFileStreamReaderTest : public testing::Test {
test_file_modification_time_ = info.last_modified;
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Give another chance for deleted streams to perform Close.
base::RunLoop().RunUntilIdle();
file_thread_.Stop();
diff --git a/content/browser/fileapi/local_file_stream_writer_unittest.cc b/content/browser/fileapi/local_file_stream_writer_unittest.cc
index 8b4e446..b472b58 100644
--- a/content/browser/fileapi/local_file_stream_writer_unittest.cc
+++ b/content/browser/fileapi/local_file_stream_writer_unittest.cc
@@ -28,12 +28,12 @@ class LocalFileStreamWriterTest : public testing::Test {
LocalFileStreamWriterTest()
: file_thread_("FileUtilProxyTestFileThread") {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(file_thread_.Start());
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
// Give another chance for deleted streams to perform Close.
base::RunLoop().RunUntilIdle();
file_thread_.Stop();
diff --git a/content/browser/fileapi/mock_file_change_observer.h b/content/browser/fileapi/mock_file_change_observer.h
index a316138..db110ac 100644
--- a/content/browser/fileapi/mock_file_change_observer.h
+++ b/content/browser/fileapi/mock_file_change_observer.h
@@ -23,13 +23,13 @@ class MockFileChangeObserver : public FileChangeObserver {
static ChangeObserverList CreateList(MockFileChangeObserver* observer);
// FileChangeObserver overrides.
- virtual void OnCreateFile(const FileSystemURL& url) OVERRIDE;
+ 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;
+ 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 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 9f0ffef..b01c6c9 100644
--- a/content/browser/fileapi/mock_file_update_observer.h
+++ b/content/browser/fileapi/mock_file_update_observer.h
@@ -25,9 +25,9 @@ class MockFileUpdateObserver : public FileUpdateObserver {
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;
+ virtual void OnStartUpdate(const FileSystemURL& url) override;
+ virtual void OnUpdate(const FileSystemURL& url, int64 delta) override;
+ virtual 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 137b114..ef301ae 100644
--- a/content/browser/fileapi/mock_url_request_delegate.h
+++ b/content/browser/fileapi/mock_url_request_delegate.h
@@ -19,9 +19,9 @@ class MockURLRequestDelegate : public net::URLRequest::Delegate {
MockURLRequestDelegate();
virtual ~MockURLRequestDelegate();
- virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE;
+ virtual void OnResponseStarted(net::URLRequest* request) override;
virtual void OnReadCompleted(net::URLRequest* request,
- int bytes_read) OVERRIDE;
+ int bytes_read) override;
const std::string& response_data() const { return response_data_; }
private:
diff --git a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
index c2f9829..895729a 100644
--- a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
+++ b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc
@@ -48,7 +48,7 @@ std::string RegisterFileSystem() {
class PluginPrivateFileSystemBackendTest : public testing::Test {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
context_ = CreateFileSystemContextForTesting(
NULL /* quota_manager_proxy */,
diff --git a/content/browser/fileapi/recursive_operation_delegate_unittest.cc b/content/browser/fileapi/recursive_operation_delegate_unittest.cc
index 3d955cc..58e935e 100644
--- a/content/browser/fileapi/recursive_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/recursive_operation_delegate_unittest.cc
@@ -50,16 +50,16 @@ class LoggingRecursiveOperation : public storage::RecursiveOperationDelegate {
const std::vector<LogEntry>& log_entries() const { return log_entries_; }
// RecursiveOperationDelegate overrides.
- virtual void Run() OVERRIDE {
+ virtual void Run() override {
NOTREACHED();
}
- virtual void RunRecursively() OVERRIDE {
+ virtual void RunRecursively() override {
StartRecursiveOperation(root_, callback_);
}
virtual void ProcessFile(const FileSystemURL& url,
- const StatusCallback& callback) OVERRIDE {
+ const StatusCallback& callback) override {
RecordLogEntry(LogEntry::PROCESS_FILE, url);
operation_runner()->GetMetadata(
url,
@@ -68,13 +68,13 @@ class LoggingRecursiveOperation : public storage::RecursiveOperationDelegate {
}
virtual void ProcessDirectory(const FileSystemURL& url,
- const StatusCallback& callback) OVERRIDE {
+ 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 {
+ const StatusCallback& callback) override {
RecordLogEntry(LogEntry::POST_PROCESS_DIRECTORY, url);
callback.Run(base::File::FILE_OK);
}
@@ -132,12 +132,12 @@ void CallCancelLater(storage::RecursiveOperationDelegate* operation,
class RecursiveOperationDelegateTest : public testing::Test {
protected:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
EXPECT_TRUE(base_.CreateUniqueTempDir());
sandbox_file_system_.SetUp(base_.path().AppendASCII("filesystem"));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
sandbox_file_system_.TearDown();
}
diff --git a/content/browser/fileapi/transient_file_util_unittest.cc b/content/browser/fileapi/transient_file_util_unittest.cc
index 5be21fa..7a6266b 100644
--- a/content/browser/fileapi/transient_file_util_unittest.cc
+++ b/content/browser/fileapi/transient_file_util_unittest.cc
@@ -25,7 +25,7 @@ class TransientFileUtilTest : public testing::Test {
TransientFileUtilTest() {}
virtual ~TransientFileUtilTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
file_system_context_ = CreateFileSystemContextForTesting(
NULL, base::FilePath(FILE_PATH_LITERAL("dummy")));
transient_file_util_.reset(new storage::TransientFileUtil);
@@ -33,7 +33,7 @@ class TransientFileUtilTest : public testing::Test {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
file_system_context_ = NULL;
base::RunLoop().RunUntilIdle();
}
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 8c0becd..806473e 100644
--- a/content/browser/fileapi/upload_file_system_file_element_reader.h
+++ b/content/browser/fileapi/upload_file_system_file_element_reader.h
@@ -34,12 +34,12 @@ class CONTENT_EXPORT UploadFileSystemFileElementReader :
virtual ~UploadFileSystemFileElementReader();
// UploadElementReader overrides:
- virtual int Init(const net::CompletionCallback& callback) OVERRIDE;
- virtual uint64 GetContentLength() const OVERRIDE;
- virtual uint64 BytesRemaining() const OVERRIDE;
+ 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;
+ const net::CompletionCallback& callback) override;
private:
void OnGetLength(const net::CompletionCallback& callback, int64 result);
diff --git a/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc b/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
index 7bdd03e..812d871 100644
--- a/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
+++ b/content/browser/fileapi/upload_file_system_file_element_reader_unittest.cc
@@ -36,7 +36,7 @@ class UploadFileSystemFileElementReaderTest : public testing::Test {
public:
UploadFileSystemFileElementReaderTest() {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
file_system_context_ = CreateFileSystemContextForTesting(
@@ -74,7 +74,7 @@ class UploadFileSystemFileElementReaderTest : public testing::Test {
EXPECT_FALSE(reader_->IsInMemory());
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
reader_.reset();
base::RunLoop().RunUntilIdle();
}