| Index: content/browser/memory/memory_coordinator_impl.cc
|
| diff --git a/content/browser/memory/memory_coordinator_impl.cc b/content/browser/memory/memory_coordinator_impl.cc
|
| index ffd91b6657b791441f73bbe22efe61f4837c7aae..8dbfa01f4082f02aa5b511444b47def7f818335f 100644
|
| --- a/content/browser/memory/memory_coordinator_impl.cc
|
| +++ b/content/browser/memory/memory_coordinator_impl.cc
|
| @@ -261,7 +261,7 @@ MemoryState MemoryCoordinatorImpl::GetCurrentMemoryState() const {
|
| void MemoryCoordinatorImpl::ForceSetMemoryCondition(MemoryCondition condition,
|
| base::TimeDelta duration) {
|
| UpdateConditionIfNeeded(condition);
|
| - condition_observer_->ScheduleUpdateCondition(duration);
|
| + suppress_condition_change_until_ = tick_clock_->NowTicks() + duration;
|
| }
|
|
|
| void MemoryCoordinatorImpl::Observe(int type,
|
| @@ -304,6 +304,9 @@ void MemoryCoordinatorImpl::UpdateConditionIfNeeded(
|
| if (memory_condition_ == next_condition)
|
| return;
|
|
|
| + if (suppress_condition_change_until_ > tick_clock_->NowTicks())
|
| + return;
|
| +
|
| MemoryCondition prev_condition = memory_condition_;
|
| memory_condition_ = next_condition;
|
|
|
|
|