Rename OS-specific MemoryPressureMonitor implementations.

This is cleanup from https://codereview.chromium.org/1122863005/

BUG=472772

Review URL: https://codereview.chromium.org/1124163003

Cr-Commit-Position: refs/heads/master@{#330032}

3 files changed, 36 insertions, 31 deletions

diff --git a/base/mac/memory_pressure_monitor_mac.cc b/base/mac/memory_pressure_monitor.cc
index 81727bb..5667aa6 100644
--- a/base/mac/memory_pressure_monitor_mac.cc
+++ b/base/mac/memory_pressure_monitor.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/mac/memory_pressure_monitor_mac.h"
+#include "base/mac/memory_pressure_monitor.h"
 
 #include <dlfcn.h>
 #include <sys/sysctl.h>
@@ -10,9 +10,10 @@
 #include "base/mac/mac_util.h"
 
 namespace base {
+namespace mac {
 
 MemoryPressureListener::MemoryPressureLevel
-MemoryPressureMonitorMac::MemoryPressureLevelForMacMemoryPressure(
+MemoryPressureMonitor::MemoryPressureLevelForMacMemoryPressure(
     int mac_memory_pressure) {
   switch (mac_memory_pressure) {
     case DISPATCH_MEMORYPRESSURE_NORMAL:
@@ -25,7 +26,7 @@ MemoryPressureMonitorMac::MemoryPressureLevelForMacMemoryPressure(
   return MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE;
 }
 
-void MemoryPressureMonitorMac::NotifyMemoryPressureChanged(
+void MemoryPressureMonitor::NotifyMemoryPressureChanged(
     dispatch_source_s* event_source) {
   int mac_memory_pressure = dispatch_source_get_data(event_source);
   MemoryPressureListener::MemoryPressureLevel memory_pressure_level =
@@ -33,7 +34,7 @@ void MemoryPressureMonitorMac::NotifyMemoryPressureChanged(
   MemoryPressureListener::NotifyMemoryPressure(memory_pressure_level);
 }
 
-MemoryPressureMonitorMac::MemoryPressureMonitorMac()
+MemoryPressureMonitor::MemoryPressureMonitor()
   : memory_level_event_source_(nullptr) {
   // _dispatch_source_type_memorypressure is not available prior to 10.9.
   dispatch_source_type_t dispatch_source_memorypressure =
@@ -58,11 +59,11 @@ MemoryPressureMonitorMac::MemoryPressureMonitorMac()
   }
 }
 
-MemoryPressureMonitorMac::~MemoryPressureMonitorMac() {
+MemoryPressureMonitor::~MemoryPressureMonitor() {
 }
 
 MemoryPressureListener::MemoryPressureLevel
-MemoryPressureMonitorMac::GetCurrentPressureLevel() const {
+MemoryPressureMonitor::GetCurrentPressureLevel() const {
   if (base::mac::IsOSMountainLionOrEarlier()) {
     return MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE;
   }
@@ -73,4 +74,5 @@ MemoryPressureMonitorMac::GetCurrentPressureLevel() const {
   return MemoryPressureLevelForMacMemoryPressure(mac_memory_pressure);
 }
 
+}  // namespace mac
 }  // namespace base
diff --git a/base/mac/memory_pressure_monitor_mac.h b/base/mac/memory_pressure_monitor.h
index 8dc2622..afaec27 100644
--- a/base/mac/memory_pressure_monitor_mac.h
+++ b/base/mac/memory_pressure_monitor.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_MAC_MEMORY_PRESSURE_MONITOR_MAC_H_
-#define BASE_MAC_MEMORY_PRESSURE_MONITOR_MAC_H_
+#ifndef BASE_MAC_MEMORY_PRESSURE_MONITOR_H_
+#define BASE_MAC_MEMORY_PRESSURE_MONITOR_H_
 
 #include <dispatch/dispatch.h>
 
@@ -23,8 +23,9 @@
 #endif  // DISPATCH_MEMORYPRESSURE_NORMAL
 
 namespace base {
+namespace mac {
 
-class TestMemoryPressureMonitorMac;
+class TestMemoryPressureMonitor;
 
 struct DispatchSourceSDeleter {
   void operator()(dispatch_source_s* ptr) {
@@ -35,17 +36,16 @@ struct DispatchSourceSDeleter {
 
 // Declares the interface for the Mac MemoryPressureMonitor, which reports
 // memory pressure events and status.
-class BASE_EXPORT MemoryPressureMonitorMac : public MemoryPressureMonitor {
+class BASE_EXPORT MemoryPressureMonitor : public base::MemoryPressureMonitor {
  public:
-  using MemoryPressureLevel = base::MemoryPressureListener::MemoryPressureLevel;
-  MemoryPressureMonitorMac();
-  ~MemoryPressureMonitorMac() override;
+  MemoryPressureMonitor();
+  ~MemoryPressureMonitor() override;
 
   // Returns the currently-observed memory pressure.
   MemoryPressureLevel GetCurrentPressureLevel() const override;
 
  private:
-  friend TestMemoryPressureMonitorMac;
+  friend TestMemoryPressureMonitor;
 
   static MemoryPressureLevel
       MemoryPressureLevelForMacMemoryPressure(int mac_memory_pressure);
@@ -54,9 +54,10 @@ class BASE_EXPORT MemoryPressureMonitorMac : public MemoryPressureMonitor {
   scoped_ptr<dispatch_source_s, DispatchSourceSDeleter>
       memory_level_event_source_;
 
-  DISALLOW_COPY_AND_ASSIGN(MemoryPressureMonitorMac);
+  DISALLOW_COPY_AND_ASSIGN(MemoryPressureMonitor);
 };
 
+}  // namespace mac
 }  // namespace base
 
-#endif  // BASE_MAC_MEMORY_PRESSURE_MONITOR_MAC_H_
+#endif  // BASE_MAC_MEMORY_PRESSURE_MONITOR_H_
diff --git a/base/mac/memory_pressure_monitor_mac_unittest.cc b/base/mac/memory_pressure_monitor_unittest.cc
index 24ee09a..acb3666 100644
--- a/base/mac/memory_pressure_monitor_mac_unittest.cc
+++ b/base/mac/memory_pressure_monitor_unittest.cc
@@ -2,50 +2,51 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/mac/memory_pressure_monitor_mac.h"
+#include "base/mac/memory_pressure_monitor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
+namespace mac {
 
-class TestMemoryPressureMonitorMac : public MemoryPressureMonitorMac {
+class TestMemoryPressureMonitor : public MemoryPressureMonitor {
  public:
-  using MemoryPressureMonitorMac::MemoryPressureLevelForMacMemoryPressure;
+  using MemoryPressureMonitor::MemoryPressureLevelForMacMemoryPressure;
 
-  TestMemoryPressureMonitorMac() { }
+  TestMemoryPressureMonitor() { }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestMemoryPressureMonitorMac);
+  DISALLOW_COPY_AND_ASSIGN(TestMemoryPressureMonitor);
 };
 
-TEST(TestMemoryPressureMonitorMac, MemoryPressureFromMacMemoryPressure) {
+TEST(MacMemoryPressureMonitorTest, MemoryPressureFromMacMemoryPressure) {
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(
                     DISPATCH_MEMORYPRESSURE_NORMAL));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(
                     DISPATCH_MEMORYPRESSURE_WARN));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(
                     DISPATCH_MEMORYPRESSURE_CRITICAL));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(0));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(3));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(5));
   EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE,
-            TestMemoryPressureMonitorMac::
+            TestMemoryPressureMonitor::
                 MemoryPressureLevelForMacMemoryPressure(-1));
 }
 
-TEST(TestMemoryPressureMonitorMac, CurrentMemoryPressure) {
-  TestMemoryPressureMonitorMac monitor;
+TEST(MacMemoryPressureMonitorTest, CurrentMemoryPressure) {
+  TestMemoryPressureMonitor monitor;
   MemoryPressureListener::MemoryPressureLevel memory_pressure =
       monitor.GetCurrentPressureLevel();
   EXPECT_TRUE(memory_pressure ==
@@ -56,4 +57,5 @@ TEST(TestMemoryPressureMonitorMac, CurrentMemoryPressure) {
                   MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL);
 }
 
+}  // namespace mac
 }  // namespace base