Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: base/memory/memory_pressure_monitor_chromeos_unittest.cc

Issue 1149223002: Avoid basename conflict from memory_pressure_monitor.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: includes Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/memory_pressure_monitor_chromeos.h"
6
5 #include "base/basictypes.h" 7 #include "base/basictypes.h"
6 #include "base/chromeos/memory_pressure_monitor.h"
7 #include "base/memory/memory_pressure_listener.h" 8 #include "base/memory/memory_pressure_listener.h"
8 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 11
11 namespace base { 12 namespace base {
12 namespace chromeos { 13 namespace chromeos {
13 14
14 namespace { 15 namespace {
15 16
16 // True if the memory notifier got called. 17 // True if the memory notifier got called.
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 on_memory_pressure_level); 157 on_memory_pressure_level);
157 break; 158 break;
158 } 159 }
159 } 160 }
160 // We should have needed exactly the same amount of checks as before. 161 // We should have needed exactly the same amount of checks as before.
161 EXPECT_EQ(j, i); 162 EXPECT_EQ(j, i);
162 } 163 }
163 164
164 } // namespace chromeos 165 } // namespace chromeos
165 } // namespace base 166 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/memory_pressure_monitor_chromeos.cc ('k') | base/memory/memory_pressure_monitor_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698