Update from https://crrev.com/333737

base/memory/memory_pressure_monitor_chromeos_unittest.cc

Index: base/memory/memory_pressure_monitor_chromeos_unittest.cc
diff --git a/base/chromeos/memory_pressure_monitor_chromeos_unittest.cc b/base/memory/memory_pressure_monitor_chromeos_unittest.cc
similarity index 93%
rename from base/chromeos/memory_pressure_monitor_chromeos_unittest.cc
rename to base/memory/memory_pressure_monitor_chromeos_unittest.cc
index 72e00d37d7fbc604fd0885e0df33744983c70aa6..e0afa448a412e80a24be8293716ecd403d954de9 100644
--- a/base/chromeos/memory_pressure_monitor_chromeos_unittest.cc
+++ b/base/memory/memory_pressure_monitor_chromeos_unittest.cc
@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/memory/memory_pressure_monitor_chromeos.h"
+
 #include "base/basictypes.h"
-#include "base/chromeos/memory_pressure_monitor_chromeos.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 +42,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 +72,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 +162,5 @@ TEST(MemoryPressureMonitorChromeOSTest, CheckMemoryPressure) {
   EXPECT_EQ(j, i);
 }
 
+}  // namespace chromeos
 }  // namespace base