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

Unified Diff: base/memory/discardable_memory_manager_unittest.cc

Issue 611153004: replace OVERRIDE and FINAL with override and final in base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CC_ -> BASE_ 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 | « base/memory/discardable_memory_malloc.h ('k') | base/memory/linked_ptr_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/discardable_memory_manager_unittest.cc
diff --git a/base/memory/discardable_memory_manager_unittest.cc b/base/memory/discardable_memory_manager_unittest.cc
index 674499fe0ea0bd98bf6618fbc47dbe4137b6019c..18ceec3bac243949e96eda4ddd44cdefa2deb9e3 100644
--- a/base/memory/discardable_memory_manager_unittest.cc
+++ b/base/memory/discardable_memory_manager_unittest.cc
@@ -18,18 +18,18 @@ class TestAllocationImpl : public internal::DiscardableMemoryManagerAllocation {
virtual ~TestAllocationImpl() { DCHECK(!is_locked_); }
// Overridden from internal::DiscardableMemoryManagerAllocation:
- virtual bool AllocateAndAcquireLock() OVERRIDE {
+ virtual bool AllocateAndAcquireLock() override {
bool was_allocated = is_allocated_;
is_allocated_ = true;
DCHECK(!is_locked_);
is_locked_ = true;
return was_allocated;
}
- virtual void ReleaseLock() OVERRIDE {
+ virtual void ReleaseLock() override {
DCHECK(is_locked_);
is_locked_ = false;
}
- virtual void Purge() OVERRIDE {
+ virtual void Purge() override {
DCHECK(is_allocated_);
is_allocated_ = false;
}
@@ -58,7 +58,7 @@ class TestDiscardableMemoryManagerImpl
private:
// Overriden from internal::DiscardableMemoryManager:
- virtual TimeTicks Now() const OVERRIDE { return now_; }
+ virtual TimeTicks Now() const override { return now_; }
TimeTicks now_;
};
@@ -456,9 +456,9 @@ class ThreadedDiscardableMemoryManagerTest
: memory_usage_thread_("memory_usage_thread"),
thread_sync_(true, false) {}
- virtual void SetUp() OVERRIDE { memory_usage_thread_.Start(); }
+ virtual void SetUp() override { memory_usage_thread_.Start(); }
- virtual void TearDown() OVERRIDE { memory_usage_thread_.Stop(); }
+ virtual void TearDown() override { memory_usage_thread_.Stop(); }
void UseMemoryHelper() {
size_t size = 1024;
« no previous file with comments | « base/memory/discardable_memory_malloc.h ('k') | base/memory/linked_ptr_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698