Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2021)

Unified Diff: base/memory/memory_coordinator_proxy.cc

Issue 2565323002: Stop using callbacks in MemoryCoordinatorProxy (Closed)
Patch Set: fix Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698