Migrate ChromeOS to base::MemoryPressureMonitor

base/chromeos/memory_pressure_monitor_chromeos.h

Index: base/chromeos/memory_pressure_monitor_chromeos.h
diff --git a/base/chromeos/memory_pressure_observer_chromeos.h b/base/chromeos/memory_pressure_monitor_chromeos.h
similarity index 84%
rename from base/chromeos/memory_pressure_observer_chromeos.h
rename to base/chromeos/memory_pressure_monitor_chromeos.h
index 9af07d41d4789fd40a886123e4fdb3ae89cf39f5..930592aa9ab504fc9cdbc28b478910f4d2a83c75 100644
--- a/base/chromeos/memory_pressure_observer_chromeos.h
+++ b/base/chromeos/memory_pressure_monitor_chromeos.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_CHROMEOS_MEMORY_PRESSURE_OBSERVER_CHROMEOS_H_
-#define BASE_CHROMEOS_MEMORY_PRESSURE_OBSERVER_CHROMEOS_H_
+#ifndef BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_
+#define BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_
 
 #include "base/base_export.h"
 #include "base/gtest_prod_util.h"
@@ -14,16 +14,16 @@
 
 namespace base {
 
-class TestMemoryPressureObserver;
+class TestMemoryPressureMonitor;
 
 ////////////////////////////////////////////////////////////////////////////////
-// MemoryPressureObserverChromeOS
+// MemoryPressureMonitorChromeOS
 //
 // A class to handle the observation of our free memory. It notifies the
 // MemoryPressureListener of memory fill level changes, so that it can take
 // action to reduce memory resources accordingly.
 //
-class BASE_EXPORT MemoryPressureObserverChromeOS {
+class BASE_EXPORT MemoryPressureMonitorChromeOS {

[chrisha, 2015/04/08 21:38:16]

Shouldn't this inherit from base::MemoryPressure?

[dmichael (off chromium), 2015/04/08 22:09:03]

Ugh, I had this right in an earlier patch but messed up when reshuffling to
base. Thanks.

  public:
   using GetUsedMemoryInPercentCallback = int (*)();
 
@@ -47,8 +47,8 @@ class BASE_EXPORT MemoryPressureObserverChromeOS {
     THRESHOLD_AGGRESSIVE = 4
   };
 
-  explicit MemoryPressureObserverChromeOS(MemoryPressureThresholds thresholds);
-  virtual ~MemoryPressureObserverChromeOS();
+  explicit MemoryPressureMonitorChromeOS(MemoryPressureThresholds thresholds);
+  virtual ~MemoryPressureMonitorChromeOS();
 
   // Redo the memory pressure calculation soon and call again if a critical
   // memory pressure prevails. Note that this call will trigger an asynchronous
@@ -61,7 +61,7 @@ class BASE_EXPORT MemoryPressureObserverChromeOS {
   }
 
  private:
-  friend TestMemoryPressureObserver;
+  friend TestMemoryPressureMonitor;
   // Starts observing the memory fill level.
   // Calls to StartObserving should always be matched with calls to
   // StopObserving.
@@ -89,7 +89,7 @@ class BASE_EXPORT MemoryPressureObserverChromeOS {
 
   // A periodic timer to check for resource pressure changes. This will get
   // replaced by a kernel triggered event system (see crbug.com/381196).
-  base::RepeatingTimer<MemoryPressureObserverChromeOS> timer_;
+  base::RepeatingTimer<MemoryPressureMonitorChromeOS> timer_;
 
   // To slow down the amount of moderate pressure event calls, this counter
   // gets used to count the number of events since the last event occured.
@@ -99,11 +99,11 @@ class BASE_EXPORT MemoryPressureObserverChromeOS {
   const int moderate_pressure_threshold_percent_;
   const int critical_pressure_threshold_percent_;
 
-  base::WeakPtrFactory<MemoryPressureObserverChromeOS> weak_ptr_factory_;
+  base::WeakPtrFactory<MemoryPressureMonitorChromeOS> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(MemoryPressureObserverChromeOS);
+  DISALLOW_COPY_AND_ASSIGN(MemoryPressureMonitorChromeOS);
 };
 
 }  // namespace base
 
-#endif  // BASE_CHROMEOS_MEMORY_PRESSURE_OBSERVER_CHROMEOS_H_
+#endif  // BASE_CHROMEOS_MEMORY_PRESSURE_MONITOR_CHROMEOS_H_