| 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..07d813d27259c137290fe4074bff7e2f4f7a117c 100644
|
| --- a/content/browser/renderer_host/renderer_frame_manager.cc
|
| +++ b/content/browser/renderer_host/renderer_frame_manager.cc
|
| @@ -9,12 +9,12 @@
|
| #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
|
|
|
| @@ -83,16 +83,15 @@ size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const {
|
| if (!browser_main_loop)
|
| return max_number_of_saved_frames_;
|
|
|
| - base::MemoryPressureObserverChromeOS* observer =
|
| - browser_main_loop->memory_pressure_observer();
|
| + base::MemoryPressureMonitor* monitor = base::MemoryPressureMonitor::Get();
|
|
|
| - 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;
|
|
|