Index: content/browser/memory/memory_monitor_android.cc |
diff --git a/content/browser/memory/memory_monitor_android.cc b/content/browser/memory/memory_monitor_android.cc |
index 54639e8c655ed575c2ada15135a6af6e68a20ec4..4867153e73a3206c4a77f28b712bec7b65db323e 100644 |
--- a/content/browser/memory/memory_monitor_android.cc |
+++ b/content/browser/memory/memory_monitor_android.cc |
@@ -76,31 +76,29 @@ static void OnTrimMemory(JNIEnv* env, |
DCHECK(level >= 0 && level <= kTrimMemoryLevelMax); |
auto* coordinator = MemoryCoordinatorImpl::GetInstance(); |
- auto state = coordinator->GetGlobalMemoryState(); |
- switch (state) { |
- case base::MemoryState::NORMAL: |
+ // TODO(bashi): Update metrics. |
+ auto condition = coordinator->GetMemoryCondtion(); |
+ switch (condition) { |
+ case MemoryCondition::NORMAL: |
UMA_HISTOGRAM_ENUMERATION("Memory.Coordinator.TrimMemoryLevel.Normal", |
level, kTrimMemoryLevelMax); |
break; |
- case base::MemoryState::THROTTLED: |
+ case MemoryCondition::WARNING: |
UMA_HISTOGRAM_ENUMERATION("Memory.Coordinator.TrimMemoryLevel.Throttled", |
level, kTrimMemoryLevelMax); |
break; |
- case base::MemoryState::SUSPENDED: |
+ case MemoryCondition::CRITICAL: |
UMA_HISTOGRAM_ENUMERATION("Memory.Coordinator.TrimMemoryLevel.Suspended", |
level, kTrimMemoryLevelMax); |
break; |
- case base::MemoryState::UNKNOWN: |
- NOTREACHED(); |
- break; |
} |
if (level >= kTrimMemoryRunningCritical) { |
- coordinator->ForceSetGlobalState(base::MemoryState::SUSPENDED, |
- base::TimeDelta::FromMinutes(1)); |
+ coordinator->ForceSetMemoryCondition(MemoryCondition::WARNING, |
+ base::TimeDelta::FromMinutes(1)); |
} else if (level >= kTrimMemoryRunningLow) { |
- coordinator->ForceSetGlobalState(base::MemoryState::THROTTLED, |
- base::TimeDelta::FromMinutes(1)); |
+ coordinator->ForceSetMemoryCondition(MemoryCondition::CRITICAL, |
+ base::TimeDelta::FromMinutes(1)); |
} |
} |