| Index: base/memory/memory_coordinator_proxy.cc | 
| diff --git a/base/memory/memory_coordinator_proxy.cc b/base/memory/memory_coordinator_proxy.cc | 
| index 24b6d66655e0e0d1cdaf59f89b7c2f2cb0c7458f..514366e4d5157af79c0a58b3a34b1161da073d1d 100644 | 
| --- a/base/memory/memory_coordinator_proxy.cc | 
| +++ b/base/memory/memory_coordinator_proxy.cc | 
| @@ -12,30 +12,25 @@ MemoryCoordinatorProxy::MemoryCoordinatorProxy() { | 
| MemoryCoordinatorProxy::~MemoryCoordinatorProxy() { | 
| } | 
|  | 
| +// static | 
| MemoryCoordinatorProxy* MemoryCoordinatorProxy::GetInstance() { | 
| return Singleton<base::MemoryCoordinatorProxy>::get(); | 
| } | 
|  | 
| -MemoryState MemoryCoordinatorProxy::GetCurrentMemoryState() const { | 
| -  if (!getter_callback_) | 
| -    return MemoryState::NORMAL; | 
| -  return getter_callback_.Run(); | 
| -} | 
| - | 
| -void MemoryCoordinatorProxy::SetCurrentMemoryStateForTesting( | 
| -    MemoryState memory_state) { | 
| -  DCHECK(setter_callback_); | 
| -  setter_callback_.Run(memory_state); | 
| +void MemoryCoordinatorProxy::Set(WeakPtr<MemoryCoordinatorInterface> instance) { | 
| +  instance_ = instance; | 
| } | 
|  | 
| -void MemoryCoordinatorProxy::SetGetCurrentMemoryStateCallback( | 
| -    GetCurrentMemoryStateCallback callback) { | 
| -  getter_callback_ = callback; | 
| +MemoryState MemoryCoordinatorProxy::GetLocalMemoryState() const { | 
| +  if (!instance_) | 
| +    return MemoryState::NORMAL; | 
| +  return instance_->GetLocalMemoryState(); | 
| } | 
|  | 
| -void MemoryCoordinatorProxy::SetSetCurrentMemoryStateForTestingCallback( | 
| -    SetCurrentMemoryStateCallback callback) { | 
| -  setter_callback_ = callback; | 
| +void MemoryCoordinatorProxy::SetMemoryStateForTesting( | 
| +    MemoryState memory_state) { | 
| +  DCHECK(instance_); | 
| +  instance_->SetMemoryStateForTesting(memory_state); | 
| } | 
|  | 
| }  // namespace base | 
|  |