Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: content/browser/appcache/appcache_storage_impl_unittest.cc

Issue 631773003: Replacing the OVERRIDE with override and FINAL with final in content/browser/appcache (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/appcache/appcache_storage_impl.cc ('k') | content/browser/appcache/appcache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/appcache/appcache_storage_impl_unittest.cc
diff --git a/content/browser/appcache/appcache_storage_impl_unittest.cc b/content/browser/appcache/appcache_storage_impl_unittest.cc
index 432c65ecd7b006ef6fe5955bb614946be9eb4025..69e45efe4151faa88e9580966c4d257d40f6fda9 100644
--- a/content/browser/appcache/appcache_storage_impl_unittest.cc
+++ b/content/browser/appcache/appcache_storage_impl_unittest.cc
@@ -128,7 +128,7 @@ class MockHttpServerJobFactory
public:
virtual net::URLRequestJob* MaybeCreateJob(
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
return MockHttpServer::CreateJob(request, network_delegate);
}
};
@@ -147,7 +147,7 @@ class IOThread : public base::Thread {
return request_context_.get();
}
- virtual void Init() OVERRIDE {
+ virtual void Init() override {
scoped_ptr<net::URLRequestJobFactoryImpl> factory(
new net::URLRequestJobFactoryImpl());
factory->SetProtocolHandler("http", new MockHttpServerJobFactory);
@@ -157,7 +157,7 @@ class IOThread : public base::Thread {
AppCacheInterceptor::EnsureRegistered();
}
- virtual void CleanUp() OVERRIDE {
+ virtual void CleanUp() override {
request_context_.reset();
job_factory_.reset();
}
@@ -182,14 +182,14 @@ class AppCacheStorageImplTest : public testing::Test {
found_cache_id_(kAppCacheNoCacheId), test_(test) {
}
- virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) OVERRIDE {
+ virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) override {
loaded_cache_ = cache;
loaded_cache_id_ = cache_id;
test_->ScheduleNextTask();
}
virtual void OnGroupLoaded(AppCacheGroup* group,
- const GURL& manifest_url) OVERRIDE {
+ const GURL& manifest_url) override {
loaded_group_ = group;
loaded_manifest_url_ = manifest_url;
loaded_groups_newest_cache_ = group ? group->newest_complete_cache()
@@ -199,7 +199,7 @@ class AppCacheStorageImplTest : public testing::Test {
virtual void OnGroupAndNewestCacheStored(
AppCacheGroup* group, AppCache* newest_cache, bool success,
- bool would_exceed_quota) OVERRIDE {
+ bool would_exceed_quota) override {
stored_group_ = group;
stored_group_success_ = success;
would_exceed_quota_ = would_exceed_quota;
@@ -208,7 +208,7 @@ class AppCacheStorageImplTest : public testing::Test {
virtual void OnGroupMadeObsolete(AppCacheGroup* group,
bool success,
- int response_code) OVERRIDE {
+ int response_code) override {
obsoleted_group_ = group;
obsoleted_success_ = success;
test_->ScheduleNextTask();
@@ -220,7 +220,7 @@ class AppCacheStorageImplTest : public testing::Test {
const AppCacheEntry& fallback_entry,
int64 cache_id,
int64 group_id,
- const GURL& manifest_url) OVERRIDE {
+ const GURL& manifest_url) override {
found_url_ = url;
found_entry_ = entry;
found_namespace_entry_url_ = namespace_entry_url;
@@ -264,7 +264,7 @@ class AppCacheStorageImplTest : public testing::Test {
virtual void GetUsageAndQuota(
const GURL& origin,
storage::StorageType type,
- const GetUsageAndQuotaCallback& callback) OVERRIDE {
+ const GetUsageAndQuotaCallback& callback) override {
EXPECT_EQ(storage::kStorageTypeTemporary, type);
if (async_) {
base::MessageLoop::current()->PostTask(
@@ -300,7 +300,7 @@ class AppCacheStorageImplTest : public testing::Test {
virtual void NotifyStorageAccessed(storage::QuotaClient::ID client_id,
const GURL& origin,
- storage::StorageType type) OVERRIDE {
+ storage::StorageType type) override {
EXPECT_EQ(storage::QuotaClient::kAppcache, client_id);
EXPECT_EQ(storage::kStorageTypeTemporary, type);
++notify_storage_accessed_count_;
@@ -310,7 +310,7 @@ class AppCacheStorageImplTest : public testing::Test {
virtual void NotifyStorageModified(storage::QuotaClient::ID client_id,
const GURL& origin,
storage::StorageType type,
- int64 delta) OVERRIDE {
+ int64 delta) override {
EXPECT_EQ(storage::QuotaClient::kAppcache, client_id);
EXPECT_EQ(storage::kStorageTypeTemporary, type);
++notify_storage_modified_count_;
@@ -319,18 +319,18 @@ class AppCacheStorageImplTest : public testing::Test {
}
// Not needed for our tests.
- virtual void RegisterClient(storage::QuotaClient* client) OVERRIDE {}
- virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {}
- virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {}
+ virtual void RegisterClient(storage::QuotaClient* client) override {}
+ virtual void NotifyOriginInUse(const GURL& origin) override {}
+ virtual void NotifyOriginNoLongerInUse(const GURL& origin) override {}
virtual void SetUsageCacheEnabled(storage::QuotaClient::ID client_id,
const GURL& origin,
storage::StorageType type,
- bool enabled) OVERRIDE {}
+ bool enabled) override {}
virtual void GetUsageAndQuota(
base::SequencedTaskRunner* original_task_runner,
const GURL& origin,
storage::StorageType type,
- const GetUsageAndQuotaCallback& callback) OVERRIDE {}
+ const GetUsageAndQuotaCallback& callback) override {}
int notify_storage_accessed_count_;
int notify_storage_modified_count_;
@@ -1599,7 +1599,7 @@ class AppCacheStorageImplTest : public testing::Test {
: test_(test) {}
virtual void OnServiceReinitialized(
- AppCacheStorageReference* old_storage_ref) OVERRIDE {
+ AppCacheStorageReference* old_storage_ref) override {
observed_old_storage_ = old_storage_ref;
test_->ScheduleNextTask();
}
@@ -1613,24 +1613,24 @@ class AppCacheStorageImplTest : public testing::Test {
MockAppCacheFrontend() : error_event_was_raised_(false) {}
virtual void OnCacheSelected(
- int host_id, const AppCacheInfo& info) OVERRIDE {}
+ int host_id, const AppCacheInfo& info) override {}
virtual void OnStatusChanged(const std::vector<int>& host_ids,
- AppCacheStatus status) OVERRIDE {}
+ AppCacheStatus status) override {}
virtual void OnEventRaised(const std::vector<int>& host_ids,
- AppCacheEventID event_id) OVERRIDE {}
+ AppCacheEventID event_id) override {}
virtual void OnProgressEventRaised(
const std::vector<int>& host_ids,
const GURL& url,
- int num_total, int num_complete) OVERRIDE {}
+ int num_total, int num_complete) override {}
virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
const AppCacheErrorDetails& details)
- OVERRIDE {
+ override {
error_event_was_raised_ = true;
}
virtual void OnLogMessage(int host_id, AppCacheLogLevel log_level,
- const std::string& message) OVERRIDE {}
+ const std::string& message) override {}
virtual void OnContentBlocked(
- int host_id, const GURL& manifest_url) OVERRIDE {}
+ int host_id, const GURL& manifest_url) override {}
bool error_event_was_raised_;
};
« no previous file with comments | « content/browser/appcache/appcache_storage_impl.cc ('k') | content/browser/appcache/appcache_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698