Rename OS-specific MemoryPressureMonitor implementations.

chromeos/chromeos_switches.cc

 // Copyright (c) 2012 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 "chromeos/chromeos_switches.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 
 // TODO(rsorokin): alphabetize all of these switches so they
@@ skipping 333 matching lines @@
 
 bool MemoryPressureHandlingEnabled() {
   if ((base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableMemoryPressureSystemChromeOS)) ||
       (base::FieldTrialList::FindFullName(kMemoryPressureExperimentName) ==
        kMemoryPressureHandlingOff))
     return false;
   return true;
 }
 
-base::MemoryPressureMonitorChromeOS::MemoryPressureThresholds
-GetMemoryPressureThresholds() {
+using MemoryPressureMonitor = base::chromeos::MemoryPressureMonitor;

[grt (UTC plus 2), 2015/05/14 15:40:21]

I think it's best to keep aliases like this either within the scope of a
function to limit their influence (i.e., move down to line 357) or put them at
the top of the .cc file (just after the #includes) so that it's clear that they
apply to the entire .cc file (rather than only what happens to lie below this
one line). Please pick one. In this case, I would lean toward moving it into the
function (yeah, this means the return value must be fully qualified).

[chrisha, 2015/05/14 19:53:15]

Done.

+
+MemoryPressureMonitor::MemoryPressureThresholds GetMemoryPressureThresholds() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           kMemoryPressureThresholds)) {
     const std::string group_name =
         base::FieldTrialList::FindFullName(kMemoryPressureExperimentName);
     if (group_name == kConservativeThreshold)
-      return base::MemoryPressureMonitorChromeOS::THRESHOLD_CONSERVATIVE;
+      return MemoryPressureMonitor::THRESHOLD_CONSERVATIVE;
     if (group_name == kAggressiveCacheDiscardThreshold)
-      return base::MemoryPressureMonitorChromeOS::
-          THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
+      return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
     if (group_name == kAggressiveTabDiscardThreshold)
-      return base::MemoryPressureMonitorChromeOS::
-          THRESHOLD_AGGRESSIVE_TAB_DISCARD;
+      return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE_TAB_DISCARD;
     if (group_name == kAggressiveThreshold)
-      return base::MemoryPressureMonitorChromeOS::THRESHOLD_AGGRESSIVE;
-    return base::MemoryPressureMonitorChromeOS::THRESHOLD_DEFAULT;
+      return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE;
+    return MemoryPressureMonitor::THRESHOLD_DEFAULT;
   }
 
   const std::string option =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           kMemoryPressureThresholds);
   if (option == kConservativeThreshold)
-    return base::MemoryPressureMonitorChromeOS::THRESHOLD_CONSERVATIVE;
+    return MemoryPressureMonitor::THRESHOLD_CONSERVATIVE;
   if (option == kAggressiveCacheDiscardThreshold)
-    return base::MemoryPressureMonitorChromeOS::
-        THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
+    return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE_CACHE_DISCARD;
   if (option == kAggressiveTabDiscardThreshold)
-    return base::MemoryPressureMonitorChromeOS::
-        THRESHOLD_AGGRESSIVE_TAB_DISCARD;
+    return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE_TAB_DISCARD;
   if (option == kAggressiveThreshold)
-    return base::MemoryPressureMonitorChromeOS::THRESHOLD_AGGRESSIVE;
+    return MemoryPressureMonitor::THRESHOLD_AGGRESSIVE;
 
-  return base::MemoryPressureMonitorChromeOS::THRESHOLD_DEFAULT;
+  return MemoryPressureMonitor::THRESHOLD_DEFAULT;
 }
 
 }  // namespace switches
 }  // namespace chromeos