Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / base / memory / discardable_memory_manager_unittest.cc

diff --git a/src/base/memory/discardable_memory_manager_unittest.cc b/src/base/memory/discardable_memory_manager_unittest.cc
index 674499f..12f7f08 100644 (file)
--- a/src/base/memory/discardable_memory_manager_unittest.cc
+++ b/src/base/memory/discardable_memory_manager_unittest.cc
@@ -15,24 +15,28 @@ namespace {
 class TestAllocationImpl : public internal::DiscardableMemoryManagerAllocation {
  public:
   TestAllocationImpl() : is_allocated_(false), is_locked_(false) {}
-  virtual ~TestAllocationImpl() { DCHECK(!is_locked_); }
+  ~TestAllocationImpl() override { DCHECK(!is_locked_); }
 
   // Overridden from internal::DiscardableMemoryManagerAllocation:
-  virtual bool AllocateAndAcquireLock() OVERRIDE {
+  bool AllocateAndAcquireLock() override {
     bool was_allocated = is_allocated_;
     is_allocated_ = true;
     DCHECK(!is_locked_);
     is_locked_ = true;
     return was_allocated;
   }
-  virtual void ReleaseLock() OVERRIDE {
+  void ReleaseLock() override {
     DCHECK(is_locked_);
     is_locked_ = false;
   }
-  virtual void Purge() OVERRIDE {
+  void Purge() override {
     DCHECK(is_allocated_);
     is_allocated_ = false;
   }
+  virtual bool IsMemoryResident() const override {
+    DCHECK(is_allocated_);
+    return true;
+  }
 
   bool is_locked() const { return is_locked_; }
 
@@ -58,7 +62,7 @@ class TestDiscardableMemoryManagerImpl
 
  private:
   // Overriden from internal::DiscardableMemoryManager:
-  virtual TimeTicks Now() const OVERRIDE { return now_; }
+  TimeTicks Now() const override { return now_; }
 
   TimeTicks now_;
 };
@@ -456,9 +460,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;