Rename OS-specific MemoryPressureMonitor implementations.

base/chromeos/memory_pressure_monitor_unittest.cc

 // Copyright 2014 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 "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 {
 
 // True if the memory notifier got called.
 // Do not read/modify value directly.
 bool on_memory_pressure_called = false;
 
 // If the memory notifier got called, this is the memory pressure reported.
 MemoryPressureListener::MemoryPressureLevel on_memory_pressure_level =
     MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE;
@@ skipping 11 matching lines @@
 
 // Returns true when OnMemoryPressure was called (and resets it).
 bool WasOnMemoryPressureCalled() {
   bool b = on_memory_pressure_called;
   ResetOnMemoryPressureCalled();
   return b;
 }
 
 }  // namespace
 
-class TestMemoryPressureMonitor : public MemoryPressureMonitorChromeOS {
+class TestMemoryPressureMonitor : public MemoryPressureMonitor {
  public:
   TestMemoryPressureMonitor() :
-    MemoryPressureMonitorChromeOS(
-        MemoryPressureMonitorChromeOS::THRESHOLD_DEFAULT),
+    MemoryPressureMonitor(
+        MemoryPressureMonitor::THRESHOLD_DEFAULT),

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

is "MemoryPressureMonitor::" needed?

[chrisha, 2015/05/14 15:27:17]

Done.

     memory_in_percent_override_(0) {
     // Disable any timers which are going on and set a special memory reporting
     // function.
     StopObserving();
   }
   ~TestMemoryPressureMonitor() override {}
 
   void SetMemoryInPercentOverride(int percent) {
     memory_in_percent_override_ = percent;
   }
 
   void CheckMemoryPressureForTest() {
     CheckMemoryPressure();
   }
 
  private:
   int GetUsedMemoryInPercent() override {
     return memory_in_percent_override_;
   }
 
   int memory_in_percent_override_;
   DISALLOW_COPY_AND_ASSIGN(TestMemoryPressureMonitor);
 };
 
 // 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);
   scoped_ptr<MemoryPressureListener> listener(
       new MemoryPressureListener(base::Bind(&OnMemoryPressure)));
   // Checking the memory pressure while 0% are used should not produce any
   // events.
   monitor->SetMemoryInPercentOverride(0);
   ResetOnMemoryPressureCalled();
 
@@ skipping 69 matching lines @@
     if (WasOnMemoryPressureCalled()) {
       EXPECT_EQ(MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE,
                 on_memory_pressure_level);
       break;
     }
   }
   // We should have needed exactly the same amount of checks as before.
   EXPECT_EQ(j, i);
 }
 
+}  // namespace chromeos
 }  // namespace base