Migrate ChromeOS to base::MemoryPressureMonitor

chromeos/chromeos_switches.cc

Index: chromeos/chromeos_switches.cc
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 4c7ea09981a8112c2f4f9876c88e19e6fae955ce..366de50c5d36978125ff5cdaf721814f8a10e9bc 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -347,40 +347,35 @@ bool MemoryPressureHandlingEnabled() {
   return true;
 }
 
-base::MemoryPressureObserverChromeOS::MemoryPressureThresholds
-GetMemoryPressureThresholds() {
+MemoryPressureThresholds GetMemoryPressureThresholds() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           kMemoryPressureThresholds)) {
     const std::string group_name =
         base::FieldTrialList::FindFullName(kMemoryPressureExperimentName);
     if (group_name == kConservativeThreshold)
-      return base::MemoryPressureObserverChromeOS::THRESHOLD_CONSERVATIVE;
+      return THRESHOLD_CONSERVATIVE;
     if (group_name == kAggressiveCacheDiscardThreshold)
-      return base::MemoryPressureObserverChromeOS::
-          THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
+      return THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
     if (group_name == kAggressiveTabDiscardThreshold)
-      return base::MemoryPressureObserverChromeOS::
-          THRESHOLD_AGGRESSIVE_TAB_DISCARD;
+      return THRESHOLD_AGGRESSIVE_TAB_DISCARD;
     if (group_name == kAggressiveThreshold)
-      return base::MemoryPressureObserverChromeOS::THRESHOLD_AGGRESSIVE;
-    return base::MemoryPressureObserverChromeOS::THRESHOLD_DEFAULT;
+      return THRESHOLD_AGGRESSIVE;
+    return THRESHOLD_DEFAULT;
   }
 
   const std::string option =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           kMemoryPressureThresholds);
   if (option == kConservativeThreshold)
-    return base::MemoryPressureObserverChromeOS::THRESHOLD_CONSERVATIVE;
+    return THRESHOLD_CONSERVATIVE;
   if (option == kAggressiveCacheDiscardThreshold)
-    return base::MemoryPressureObserverChromeOS::
-        THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
+    return THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
   if (option == kAggressiveTabDiscardThreshold)
-    return base::MemoryPressureObserverChromeOS::
-        THRESHOLD_AGGRESSIVE_TAB_DISCARD;
+    return THRESHOLD_AGGRESSIVE_TAB_DISCARD;
   if (option == kAggressiveThreshold)
-    return base::MemoryPressureObserverChromeOS::THRESHOLD_AGGRESSIVE;
+    return THRESHOLD_AGGRESSIVE;
 
-  return base::MemoryPressureObserverChromeOS::THRESHOLD_DEFAULT;
+  return THRESHOLD_DEFAULT;
 }
 
 }  // namespace switches