Index: content/browser/renderer_host/renderer_frame_manager.cc |
diff --git a/content/browser/renderer_host/renderer_frame_manager.cc b/content/browser/renderer_host/renderer_frame_manager.cc |
index 6f3df4c1d4b3ec199dc56a3cb603f0b52ecdf23e..e87732ee5f61d459e90ef5cac8ab81491c7bbbb6 100644 |
--- a/content/browser/renderer_host/renderer_frame_manager.cc |
+++ b/content/browser/renderer_host/renderer_frame_manager.cc |
@@ -9,15 +9,11 @@ |
#include "base/bind.h" |
#include "base/logging.h" |
#include "base/memory/memory_pressure_listener.h" |
+#include "base/memory/memory_pressure_monitor.h" |
#include "base/memory/shared_memory.h" |
#include "base/sys_info.h" |
#include "content/common/host_shared_bitmap_manager.h" |
-#if defined(OS_CHROMEOS) |
-#include "base/chromeos/memory_pressure_observer_chromeos.h" |
-#include "content/browser/browser_main_loop.h" |
-#endif |
- |
namespace content { |
namespace { |
@@ -75,24 +71,15 @@ void RendererFrameManager::UnlockFrame(RendererFrameManagerClient* frame) { |
} |
size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const { |
-#if defined(OS_CHROMEOS) |
- content::BrowserMainLoop* browser_main_loop = |
- content::BrowserMainLoop::GetInstance(); |
+ base::MemoryPressureMonitor* monitor = base::MemoryPressureMonitor::Get(); |
- // Unit tests can come here without a BrowserMainLoop instance. |
- if (!browser_main_loop) |
- return max_number_of_saved_frames_; |
- |
- base::MemoryPressureObserverChromeOS* observer = |
- browser_main_loop->memory_pressure_observer(); |
- |
- if (!observer) |
+ 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 observer. |
+ // value from our specific pressure monitor. |
int percentage = 100; |
- switch (observer->GetCurrentPressureLevel()) { |
+ switch (monitor->GetCurrentPressureLevel()) { |
case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE: |
percentage = 100; |
break; |
@@ -105,9 +92,6 @@ size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const { |
} |
size_t frames = (max_number_of_saved_frames_ * percentage) / 100; |
return std::max(static_cast<size_t>(1), frames); |
-#else |
- return max_number_of_saved_frames_; |
-#endif |
} |
RendererFrameManager::RendererFrameManager() |