A visibile to invisible state change will also release memory and should therefore wait as an unloa…

athena/resource_manager/resource_manager_unittest.cc

 /// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/activity/public/activity_view_model.h"
 #include "athena/resource_manager/memory_pressure_notifier.h"
 #include "athena/resource_manager/public/resource_manager.h"
 #include "athena/test/athena_test_base.h"
@@ skipping 226 matching lines @@
 
   // Going back to a relaxed memory pressure should reload the old activities.
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       MemoryPressureObserver::MEMORY_PRESSURE_LOW);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app2->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app3->GetCurrentState());
   EXPECT_NE(Activity::ACTIVITY_INVISIBLE, app4->GetCurrentState());
 }
 
-// Make sure that an activity which got just demoted from visible to invisible,
+// Make sure that an activity which got just reduced from visible to invisible,
 // does not get thrown out of memory in the same step.
 TEST_F(ResourceManagerTest, NoUnloadFromVisible) {
+  // The timeout override in milliseconds.
+  const int kTimeoutOverrideInMs = 20;
+  // Tell the resource manager to wait for 20ms between calls.
+  ResourceManager::Get()->SetWaitTimeBetweenResourceManageCalls(
+      kTimeoutOverrideInMs);
+
   // Create a few dummy activities in the reverse order as we need them.
   TestActivity* app2 = CreateActivity("app2");
   TestActivity* app1 = CreateActivity("app1");
   app1->SetCurrentState(Activity::ACTIVITY_VISIBLE);
   app2->SetCurrentState(Activity::ACTIVITY_VISIBLE);
 
-  // Applying low resource pressure should turn one item ivisible.
+  // Applying low resource pressure should turn one item invisible.
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_INVISIBLE, app2->GetCurrentState());
 
-  // Applying low resource pressure again will unload it.
+  // Trying to apply the memory pressure again does not do anything.
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
+  EXPECT_EQ(Activity::ACTIVITY_INVISIBLE, app2->GetCurrentState());
+
+  // Waiting and applying the pressure again should unload it.
+  usleep(kTimeoutOverrideInMs * 1000);
+  ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
+      MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL);
+  EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, app2->GetCurrentState());
 }
 
 // Make sure that ActivityVisibility changes will be updated instantaneously
 // when the ResourceManager is called for operation.
 TEST_F(ResourceManagerTest, VisibilityChangeIsInstantaneous) {
   // Create a few dummy activities in the reverse order as we need them.
   TestActivity* app3 = CreateActivity("app3");
   TestActivity* app2 = CreateActivity("app2");
   TestActivity* app1 = CreateActivity("app1");
@@ skipping 64 matching lines @@
   ResourceManager::Get()->SetMemoryPressureAndStopMonitoring(
       MemoryPressureObserver::MEMORY_PRESSURE_CRITICAL);
   EXPECT_EQ(Activity::ACTIVITY_VISIBLE, app1->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_INVISIBLE, app2->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, app3->GetCurrentState());
   EXPECT_EQ(Activity::ACTIVITY_UNLOADED, app4->GetCurrentState());
 }
 
 }  // namespace test
 }  // namespace athena