Index: content/browser/memory/memory_coordinator_impl.h |
diff --git a/content/browser/memory/memory_coordinator_impl.h b/content/browser/memory/memory_coordinator_impl.h |
index 250d58672b3410f2a97e77271df16dd431bde6e8..eb5bf0444d238aa1c3a0e32640beee991b09fbf6 100644 |
--- a/content/browser/memory/memory_coordinator_impl.h |
+++ b/content/browser/memory/memory_coordinator_impl.h |
@@ -7,6 +7,7 @@ |
#include "base/callback.h" |
#include "base/memory/memory_coordinator_client.h" |
+#include "base/memory/memory_coordinator_proxy.h" |
#include "base/memory/memory_pressure_monitor.h" |
#include "base/memory/singleton.h" |
#include "base/single_thread_task_runner.h" |
@@ -33,7 +34,8 @@ struct MemoryCoordinatorSingletonTraits; |
// MemoryCoordinatorImpl is an implementation of MemoryCoordinator. |
// The current implementation uses MemoryStateUpdater to update the global |
// memory state. See comments in MemoryStateUpdater for details. |
-class CONTENT_EXPORT MemoryCoordinatorImpl : public MemoryCoordinator, |
+class CONTENT_EXPORT MemoryCoordinatorImpl : public base::MemoryCoordinator, |
+ public MemoryCoordinator, |
public NotificationObserver, |
public base::NonThreadSafe { |
public: |
@@ -75,10 +77,10 @@ class CONTENT_EXPORT MemoryCoordinatorImpl : public MemoryCoordinator, |
// Returns the browser's current memory state. Note that the current state |
// could be different from the global memory state as the browser won't be |
// suspended. |
- MemoryState GetCurrentMemoryState() const; |
+ MemoryState GetCurrentMemoryState() const override; |
// Sets the global memory state for testing. |
- void SetCurrentMemoryStateForTesting(MemoryState memory_state); |
+ void SetCurrentMemoryStateForTesting(MemoryState memory_state) override; |
// MemoryCoordinator implementation: |
MemoryState GetStateForProcess(base::ProcessHandle handle) override; |