Migrate ChromeOS to base::MemoryPressureMonitor

content/browser/renderer_host/renderer_frame_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/renderer_frame_manager.h"
 
 #include <algorithm>
 
 #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"

[Mr4D (OOO till 08-26), 2015/04/13 15:10:52]

This can go. (with the OS_CHROMEOS) part.

[dmichael (off chromium), 2015/04/13 21:02:15]

Done.

 #endif
 
 namespace content {
 namespace {
 
 const int kModeratePressurePercentage = 50;
 const int kCriticalPressurePercentage = 10;
 
 }  // namespace
 
@@ skipping 39 matching lines @@
   if (locked_count > 1) {
     locked_frames_[frame]--;
   } else {
     RemoveFrame(frame);
     unlocked_frames_.push_front(frame);
     CullUnlockedFrames(GetMaxNumberOfSavedFrames());
   }
 }
 
 size_t RendererFrameManager::GetMaxNumberOfSavedFrames() const {
 #if defined(OS_CHROMEOS)

[Mr4D (OOO till 08-26), 2015/04/13 15:10:52]

I think that you do not want here #if defined(OS_CHROMEOS) anymore since this
optimization is good for all OS'es now.

[dmichael (off chromium), 2015/04/13 21:02:16]

I was aiming for minimizing the change here so we can turn on the optimization
carefully in a later CL, but I guess that will happen when a platform gets their
MemoryPressureMonitor implementation. Done.

   content::BrowserMainLoop* browser_main_loop =
       content::BrowserMainLoop::GetInstance();

[Mr4D (OOO till 08-26), 2015/04/13 15:10:52]

You do not need the browser_main_loop anymore.

[dmichael (off chromium), 2015/04/13 21:02:16]

Ah, thanks. Done.

 
   // 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();
+  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;
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
       percentage = kModeratePressurePercentage;
       break;
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
       percentage = kCriticalPressurePercentage;
       break;
   }
@@ skipping 55 matching lines @@
       percentage = kCriticalPressurePercentage;
       break;
     case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE:
       // No need to change anything when there is no pressure.
       return;
   }
   CullUnlockedFrames(std::max(1, (saved_frame_limit * percentage) / 100));
 }
 
 }  // namespace content