Remove MemoryCoordinatorClient from components/viz.

BUG=888904

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I5cf086f679a001ab1d87f23dbc3bd6e1213fb7f2
Reviewed-on: https://chromium-review.googlesource.com/1248381Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Saman Sami <samans@chromium.org>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Cr-Commit-Position: refs/heads/master@{#594676}

components/viz/client/frame_eviction_manager.cc

@@ -8,8 +8,6 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/memory/memory_coordinator_client_registry.h"
-#include "base/memory/memory_coordinator_proxy.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/memory_pressure_monitor.h"
 #include "base/memory/shared_memory.h"
@@ -28,6 +26,8 @@ FrameEvictionManager* FrameEvictionManager::GetInstance() {
   return base::Singleton<FrameEvictionManager>::get();
 }
 
+FrameEvictionManager::~FrameEvictionManager() {}
+
 void FrameEvictionManager::AddFrame(FrameEvictionManagerClient* frame,
                                     bool locked) {
   RemoveFrame(frame);
@@ -74,39 +74,23 @@ void FrameEvictionManager::UnlockFrame(FrameEvictionManagerClient* frame) {
 
 size_t FrameEvictionManager::GetMaxNumberOfSavedFrames() const {
   int percentage = 100;
-  auto* memory_coordinator_proxy = base::MemoryCoordinatorProxy::GetInstance();
-  if (memory_coordinator_proxy) {
-    switch (memory_coordinator_proxy->GetCurrentMemoryState()) {
-      case base::MemoryState::NORMAL:
-        percentage = 100;
-        break;
-      case base::MemoryState::THROTTLED:
-        percentage = kCriticalPressurePercentage;
-        break;
-      case base::MemoryState::SUSPENDED:
-      case base::MemoryState::UNKNOWN:
-        NOTREACHED();
-        break;
-    }
-  } else {
-    base::MemoryPressureMonitor* monitor = base::MemoryPressureMonitor::Get();
-
-    if (!monitor)
-      return max_number_of_saved_frames_;
-
-    // Until we have a global OnMemoryPressureChanged event we need to query the
-    // value from our specific pressure monitor.
-    switch (monitor->GetCurrentPressureLevel()) {
-      case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE:
-        percentage = 100;
-        break;
-      case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
-        percentage = kModeratePressurePercentage;
-        break;
-      case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
-        percentage = kCriticalPressurePercentage;
-        break;
-    }
+  base::MemoryPressureMonitor* monitor = base::MemoryPressureMonitor::Get();
+
+  if (!monitor)
+    return max_number_of_saved_frames_;
+
+  // Until we have a global OnMemoryPressureChanged event we need to query the
+  // value from our specific pressure monitor.
+  switch (monitor->GetCurrentPressureLevel()) {
+    case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE:
+      percentage = 100;
+      break;
+    case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
+      percentage = kModeratePressurePercentage;
+      break;
+    case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
+      percentage = kCriticalPressurePercentage;
+      break;
   }
   size_t frames = (max_number_of_saved_frames_ * percentage) / 100;
   return std::max(static_cast<size_t>(1), frames);
@@ -116,7 +100,6 @@ FrameEvictionManager::FrameEvictionManager()
     : memory_pressure_listener_(new base::MemoryPressureListener(
           base::Bind(&FrameEvictionManager::OnMemoryPressure,
                      base::Unretained(this)))) {
-  base::MemoryCoordinatorClientRegistry::GetInstance()->Register(this);
   max_number_of_saved_frames_ =
 #if defined(OS_ANDROID)
       // If the amount of memory on the device is >= 3.5 GB, save up to 5
@@ -127,8 +110,6 @@ FrameEvictionManager::FrameEvictionManager()
 #endif
 }
 
-FrameEvictionManager::~FrameEvictionManager() {}
-
 void FrameEvictionManager::CullUnlockedFrames(size_t saved_frame_limit) {
   while (!unlocked_frames_.empty() &&
          unlocked_frames_.size() + locked_frames_.size() > saved_frame_limit) {
@@ -154,10 +135,6 @@ void FrameEvictionManager::OnMemoryPressure(
   }
 }
 
-void FrameEvictionManager::OnPurgeMemory() {
-  PurgeMemory(kCriticalPressurePercentage);
-}
-
 void FrameEvictionManager::PurgeMemory(int percentage) {
   int saved_frame_limit = max_number_of_saved_frames_;
   if (saved_frame_limit <= 1)

components/viz/client/frame_eviction_manager.h

@@ -11,7 +11,6 @@
 #include <map>
 
 #include "base/macros.h"
-#include "base/memory/memory_coordinator_client.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/singleton.h"
 #include "components/viz/client/viz_client_export.h"
@@ -30,8 +29,7 @@ class FrameEvictionManagerClient {
 // between a small set of tabs faster. The limit is a soft limit, because
 // clients can lock their frame to prevent it from being discarded, e.g. if the
 // tab is visible, or while capturing a screenshot.
-class VIZ_CLIENT_EXPORT FrameEvictionManager
-    : public base::MemoryCoordinatorClient {
+class VIZ_CLIENT_EXPORT FrameEvictionManager {
  public:
   static FrameEvictionManager* GetInstance();
 
@@ -57,10 +55,7 @@ class VIZ_CLIENT_EXPORT FrameEvictionManager
 
  private:
   FrameEvictionManager();
-  ~FrameEvictionManager() override;
-
-  // base::MemoryCoordinatorClient implementation:
-  void OnPurgeMemory() override;
+  ~FrameEvictionManager();
 
   void CullUnlockedFrames(size_t saved_frame_limit);