Index: content/browser/memory/memory_coordinator.cc |
diff --git a/content/browser/memory/memory_coordinator.cc b/content/browser/memory/memory_coordinator.cc |
index b691322002007921695018b1e3ae16c69fec041d..bb3b03bc2b7c101c5b9a9d86b21cb9e07a143e43 100644 |
--- a/content/browser/memory/memory_coordinator.cc |
+++ b/content/browser/memory/memory_coordinator.cc |
@@ -137,12 +137,9 @@ base::MemoryState MemoryCoordinator::GetGlobalMemoryState() const { |
return base::MemoryState::UNKNOWN; |
} |
-base::MemoryState MemoryCoordinator::GetCurrentMemoryState() const { |
- return base::MemoryState::UNKNOWN; |
-} |
- |
-void MemoryCoordinator::SetCurrentMemoryStateForTesting( |
- base::MemoryState memory_state) { |
+base::WeakPtr<base::MemoryCoordinatorInterface> |
+MemoryCoordinator::GetWeakPtr() { |
+ return nullptr; |
haraken
2016/12/12 06:51:57
NOT_REACHED() ?
bashi
2016/12/12 07:17:55
Done.
|
} |
void MemoryCoordinator::AddChildForTesting( |