Index: base/chromeos/memory_pressure_monitor_unittest.cc |
diff --git a/base/chromeos/memory_pressure_monitor_chromeos_unittest.cc b/base/chromeos/memory_pressure_monitor_unittest.cc |
similarity index 93% |
rename from base/chromeos/memory_pressure_monitor_chromeos_unittest.cc |
rename to base/chromeos/memory_pressure_monitor_unittest.cc |
index 72e00d37d7fbc604fd0885e0df33744983c70aa6..4fb83327f4cd94a0283ef195a3e2f5ddc1082867 100644 |
--- a/base/chromeos/memory_pressure_monitor_chromeos_unittest.cc |
+++ b/base/chromeos/memory_pressure_monitor_unittest.cc |
@@ -3,12 +3,13 @@ |
// found in the LICENSE file. |
#include "base/basictypes.h" |
-#include "base/chromeos/memory_pressure_monitor_chromeos.h" |
+#include "base/chromeos/memory_pressure_monitor.h" |
#include "base/memory/memory_pressure_listener.h" |
#include "base/message_loop/message_loop.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace base { |
+namespace chromeos { |
namespace { |
@@ -40,12 +41,11 @@ bool WasOnMemoryPressureCalled() { |
} // namespace |
-class TestMemoryPressureMonitor : public MemoryPressureMonitorChromeOS { |
+class TestMemoryPressureMonitor : public MemoryPressureMonitor { |
public: |
- TestMemoryPressureMonitor() : |
- MemoryPressureMonitorChromeOS( |
- MemoryPressureMonitorChromeOS::THRESHOLD_DEFAULT), |
- memory_in_percent_override_(0) { |
+ TestMemoryPressureMonitor() |
+ : MemoryPressureMonitor(THRESHOLD_DEFAULT), |
+ memory_in_percent_override_(0) { |
// Disable any timers which are going on and set a special memory reporting |
// function. |
StopObserving(); |
@@ -71,7 +71,7 @@ class TestMemoryPressureMonitor : public MemoryPressureMonitorChromeOS { |
// This test tests the various transition states from memory pressure, looking |
// for the correct behavior on event reposting as well as state updates. |
-TEST(MemoryPressureMonitorChromeOSTest, CheckMemoryPressure) { |
+TEST(ChromeOSMemoryPressureMonitorTest, CheckMemoryPressure) { |
base::MessageLoopForUI message_loop; |
scoped_ptr<TestMemoryPressureMonitor> monitor( |
new TestMemoryPressureMonitor); |
@@ -161,4 +161,5 @@ TEST(MemoryPressureMonitorChromeOSTest, CheckMemoryPressure) { |
EXPECT_EQ(j, i); |
} |
+} // namespace chromeos |
} // namespace base |