Index: content/child/memory/child_memory_coordinator_impl.cc |
diff --git a/content/child/memory/child_memory_coordinator_impl.cc b/content/child/memory/child_memory_coordinator_impl.cc |
index de9f8b81d7ffe511fa3a96a90a85fb6666f2ec62..6616a22e1b7d320a2aeb5339914c886f8b7eae54 100644 |
--- a/content/child/memory/child_memory_coordinator_impl.cc |
+++ b/content/child/memory/child_memory_coordinator_impl.cc |
@@ -50,6 +50,7 @@ ChildMemoryCoordinatorImpl::ChildMemoryCoordinatorImpl( |
DCHECK(!g_child_memory_coordinator); |
g_child_memory_coordinator = this; |
parent_->AddChild(binding_.CreateInterfacePtrAndBind()); |
+ base::MemoryCoordinatorProxy::SetMemoryCoordinator(this); |
} |
ChildMemoryCoordinatorImpl::~ChildMemoryCoordinatorImpl() { |
@@ -58,6 +59,10 @@ ChildMemoryCoordinatorImpl::~ChildMemoryCoordinatorImpl() { |
g_child_memory_coordinator = nullptr; |
} |
+base::MemoryState ChildMemoryCoordinatorImpl::GetCurrentMemoryState() const { |
+ return current_state_; |
+} |
+ |
void ChildMemoryCoordinatorImpl::PurgeMemory() { |
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("memory-infra"), |
"ChildMemoryCoordinatorImpl::PurgeMemory"); |
@@ -65,12 +70,11 @@ void ChildMemoryCoordinatorImpl::PurgeMemory() { |
} |
void ChildMemoryCoordinatorImpl::OnStateChange(mojom::MemoryState state) { |
- base::MemoryState base_state = ToBaseMemoryState(state); |
+ current_state_ = ToBaseMemoryState(state); |
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("memory-infra"), |
"ChildMemoryCoordinatorImpl::OnStateChange", "state", |
- MemoryStateToString(base_state)); |
- base::MemoryCoordinatorClientRegistry::GetInstance()->Notify( |
- base_state); |
+ MemoryStateToString(current_state_)); |
+ base::MemoryCoordinatorClientRegistry::GetInstance()->Notify(current_state_); |
} |
#if !defined(OS_ANDROID) |